jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 05:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/libmediaart: remove qt4 support

Browse Source 
Qt4 support is about to be dropped, so remove the support from libmediaart
as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Peter Korsgaard 2019-02-06 15:10:53 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent e228a9fe93
commit 723e10c414
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/libmediaart/Config.in
View File

@ -32,12 +32,11 @@ config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
bool "Qt" bool "Qt"
depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5
select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
comment "Qt backend depends on Qt or Qt5" comment "Qt backend depends on Qt5"
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 depends on !BR2_PACKAGE_QT5
endchoice endchoice

4
package/libmediaart/libmediaart.mk
View File

@ -25,9 +25,7 @@ else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
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"
endif endif
LIBMEDIAART_DEPENDENCIES += \ LIBMEDIAART_DEPENDENCIES += qt5base
$(if $(BR2_PACKAGE_QT),qt) \
$(if $(BR2_PACKAGE_QT5),qt5base)
LIBMEDIAART_CONF_OPTS += \ LIBMEDIAART_CONF_OPTS += \
--disable-gdkpixbuf \ --disable-gdkpixbuf \
--enable-qt --enable-qt