NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmediaart: rename options to have proper prefix

Browse Source 
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>
This commit is contained in:
Petr Vorel 2018-05-13 21:07:36 +02:00 committed by Peter Korsgaard
parent b54c5464cc
commit 8553b39887
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Config.in.legacy
View File

@ -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 config BR2_PACKAGE_TI_SGX_AM335X
bool "ti-sgx-km AM335X option renamed" bool "ti-sgx-km AM335X option renamed"
select BR2_LEGACY select BR2_LEGACY

8
package/libmediaart/Config.in
View File

@ -20,17 +20,17 @@ choice
prompt "media art backend" prompt "media art backend"
default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
config BR2_PACKAGE_MEDIAART_BACKEND_NONE config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
bool "none" bool "none"
help help
With no backend, libmediaart will not be able to process MP3 With no backend, libmediaart will not be able to process MP3
album art. album art.
config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
bool "gdk-pixbuf" bool "gdk-pixbuf"
select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_GDK_PIXBUF
config BR2_PACKAGE_MEDIAART_BACKEND_QT config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
bool "Qt" bool "Qt"
depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT 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

6
package/libmediaart/libmediaart.mk
View File

@ -15,12 +15,12 @@ LIBMEDIAART_INSTALL_STAGING = YES
LIBMEDIAART_DEPENDENCIES = libglib2 LIBMEDIAART_DEPENDENCIES = libglib2
LIBMEDIAART_CONF_OPTS = --disable-unit-tests 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_DEPENDENCIES += gdk-pixbuf
LIBMEDIAART_CONF_OPTS += \ LIBMEDIAART_CONF_OPTS += \
--enable-gdkpixbuf \ --enable-gdkpixbuf \
--disable-qt --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) # qt5 needs c++11 (since qt-5.7)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
@ -31,7 +31,7 @@ LIBMEDIAART_DEPENDENCIES += \
LIBMEDIAART_CONF_OPTS += \ LIBMEDIAART_CONF_OPTS += \
--disable-gdkpixbuf \ --disable-gdkpixbuf \
--enable-qt --enable-qt
else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_NONE),y) else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y)
LIBMEDIAART_CONF_OPTS += \ LIBMEDIAART_CONF_OPTS += \
--disable-gdkpixbuf \ --disable-gdkpixbuf \
--disable-qt --disable-qt