libmediaart: rename options to have proper prefix

Options should be prefixed by BR2_PACKAGE_LIBMEDIAART and not
BR2_PACKAGE_MEDIAART, but package was using both prefixes.

This was found as default symbol was defined as
BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE (correct prefix), but symbol
was actually BR2_PACKAGE_MEDIAART_BACKEND_NONE).

This commit therefore renames the incorrectly named options, and adds
Config.in.legacy handling. Since the options are part of a choice, the
legacy handling cannot select the new options, and is only here to
inform the user.

Fixes: c443830a57 libmediaart: new package
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[Thomas: improve commit log, add Config.in.legacy handling]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index 4c00080965fbc1789e1af893034c0cccb1593283..e7b0316a4f96ca29d7168f755623b244e0f4e8c2 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,30 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 

+config BR2_PACKAGE_MEDIAART_BACKEND_NONE
+       bool "libmediaart none backend option renamed"
+       select BR2_LEGACY
+       help
+         For consistency reasons, the option
+         BR2_PACKAGE_MEDIAART_BACKEND_NONE has been renamed to
+         BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
+
+config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+       bool "libmediaart gdk-pixbuf backend option renamed"
+       select BR2_LEGACY
+       help
+         For consistency reasons, the option
+         BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to
+         BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
+
+config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+       bool "libmediaart qt backend option renamed"
+       select BR2_LEGACY
+       help
+         For consistency reasons, the option
+         BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to
+         BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
+

 config BR2_PACKAGE_TI_SGX_AM335X
        bool "ti-sgx-km AM335X option renamed"
        select BR2_LEGACY
 config BR2_PACKAGE_TI_SGX_AM335X
        bool "ti-sgx-km AM335X option renamed"
        select BR2_LEGACY

diff --git a/package/libmediaart/Config.in b/package/libmediaart/Config.in
index e5e770d4fcc4635e416a09dab1758120000a33b0..e07367739598e51c61de78c2a777de7909a71266 100644 (file)
--- a/package/libmediaart/Config.in
+++ b/package/libmediaart/Config.in
@@ -20,17 +20,17 @@ choice
        prompt "media art backend"
        default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
 
        prompt "media art backend"
        default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
 

-config BR2_PACKAGE_MEDIAART_BACKEND_NONE
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE

        bool "none"
        help
          With no backend, libmediaart will not be able to process MP3
          album art.
 
        bool "none"
        help
          With no backend, libmediaart will not be able to process MP3
          album art.
 

-config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF

        bool "gdk-pixbuf"
        select BR2_PACKAGE_GDK_PIXBUF
 
        bool "gdk-pixbuf"
        select BR2_PACKAGE_GDK_PIXBUF
 

-config BR2_PACKAGE_MEDIAART_BACKEND_QT
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT

        bool "Qt"
        depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
        select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
        bool "Qt"
        depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
        select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT


@@ -41,4 +41,4 @@ comment "Qt backend depends on Qt or Qt5"
 
 endchoice
 
 
 endchoice
 

-endif # BR2_PACKAGE_MEDIAART
+endif # BR2_PACKAGE_LIBMEDIAART

diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk
index db4f1fa2a18f3610cb6a23342e92426ee46497fc..f64210c26684924a61d65bc0490b6ab4b9edbb6e 100644 (file)
--- a/package/libmediaart/libmediaart.mk
+++ b/package/libmediaart/libmediaart.mk
@@ -15,12 +15,12 @@ LIBMEDIAART_INSTALL_STAGING = YES
 LIBMEDIAART_DEPENDENCIES = libglib2
 LIBMEDIAART_CONF_OPTS = --disable-unit-tests
 
 LIBMEDIAART_DEPENDENCIES = libglib2
 LIBMEDIAART_CONF_OPTS = --disable-unit-tests
 

-ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF),y)
+ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y)

 LIBMEDIAART_DEPENDENCIES += gdk-pixbuf
 LIBMEDIAART_CONF_OPTS += \
        --enable-gdkpixbuf \
        --disable-qt
 LIBMEDIAART_DEPENDENCIES += gdk-pixbuf
 LIBMEDIAART_CONF_OPTS += \
        --enable-gdkpixbuf \
        --disable-qt

-else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_QT),y)
+else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)

 # qt5 needs c++11 (since qt-5.7)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 # qt5 needs c++11 (since qt-5.7)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"


@@ -31,7 +31,7 @@ LIBMEDIAART_DEPENDENCIES += \
 LIBMEDIAART_CONF_OPTS += \
        --disable-gdkpixbuf \
        --enable-qt
 LIBMEDIAART_CONF_OPTS += \
        --disable-gdkpixbuf \
        --enable-qt

-else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_NONE),y)
+else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y)

 LIBMEDIAART_CONF_OPTS += \
        --disable-gdkpixbuf \
        --disable-qt
 LIBMEDIAART_CONF_OPTS += \
        --disable-gdkpixbuf \
        --disable-qt