rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bsp/buildroot/package/libmediaart/Config.in
View File

@@ -20,25 +20,24 @@ 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
select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
depends on BR2_PACKAGE_QT5
select BR2_PACKAGE_QT5BASE_GUI
comment "Qt backend depends on Qt or Qt5"
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
comment "Qt backend depends on Qt5"
depends on !BR2_PACKAGE_QT5
endchoice
endif # BR2_PACKAGE_MEDIAART
endif # BR2_PACKAGE_LIBMEDIAART

10
bsp/buildroot/package/libmediaart/libmediaart.mk
View File

@@ -15,23 +15,21 @@ 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"
endif
LIBMEDIAART_DEPENDENCIES += \
$(if $(BR2_PACKAGE_QT),qt) \
$(if $(BR2_PACKAGE_QT5),qt5base)
LIBMEDIAART_DEPENDENCIES += qt5base
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