[Buildroot] [git commit] libmediaart: rename options to have proper prefix
Peter Korsgaard
peter at korsgaard.com
Mon May 21 21:13:52 UTC 2018
commit: https://git.buildroot.net/buildroot/commit/?id=8553b3988717664a7130bcd58f54eb65cdb8c9e0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 at gmail.com>
[Thomas: improve commit log, add Config.in.legacy handling]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
Config.in.legacy | 24 ++++++++++++++++++++++++
package/libmediaart/Config.in | 8 ++++----
package/libmediaart/libmediaart.mk | 6 +++---
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 4c00080965..e7b0316a4f 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,30 @@ endif
###############################################################################
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
diff --git a/package/libmediaart/Config.in b/package/libmediaart/Config.in
index e5e770d4fc..e073677395 100644
--- 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
-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.
-config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+config BR2_PACKAGE_LIBMEDIAART_BACKEND_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
@@ -41,4 +41,4 @@ comment "Qt backend depends on Qt or Qt5"
endchoice
-endif # BR2_PACKAGE_MEDIAART
+endif # BR2_PACKAGE_LIBMEDIAART
diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk
index db4f1fa2a1..f64210c266 100644
--- 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
-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
-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"
@@ -31,7 +31,7 @@ LIBMEDIAART_DEPENDENCIES += \
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
More information about the buildroot
mailing list