Commit 342f29b4 authored by Fatih Aşıcı's avatar Fatih Aşıcı Committed by Thomas Petazzoni
Browse files

qt5multimedia: make qt5declarative dependency optional 



Also add missing dependencies on gui and network modules.

Signed-off-by: default avatarFatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 68e1083b

package/qt5/qt5multimedia/Config.in

+2 −8
Original line number Diff line number Diff line 
config BR2_PACKAGE_QT5MULTIMEDIA

	bool "qt5multimedia"

	select BR2_PACKAGE_QT5BASE

	select BR2_PACKAGE_QT5DECLARATIVE

	depends on BR2_PACKAGE_HAS_LIBEGL

	depends on BR2_PACKAGE_HAS_LIBGLES

	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE

	select BR2_PACKAGE_QT5BASE_GUI

	select BR2_PACKAGE_QT5BASE_NETWORK

	help

	  Qt is a cross-platform application and UI framework for

	  developers using C++.
@@ -12,7 +10,3 @@ config BR2_PACKAGE_QT5MULTIMEDIA 
	  This package corresponds to the qt5multimedia module.



	  http://qt-project.org
 


comment "qt5multimedia requires an OpenGL-capable backend"

	depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \

		BR2_PACKAGE_QT5_JSCORE_AVAILABLE

package/qt5/qt5multimedia/qt5multimedia.mk

+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
QT5MULTIMEDIA_VERSION = $(QT5_VERSION)

QT5MULTIMEDIA_SITE = $(QT5_SITE)

QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz

QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative

QT5MULTIMEDIA_DEPENDENCIES = qt5base

QT5MULTIMEDIA_INSTALL_STAGING = YES



ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
@@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) 
QT5MULTIMEDIA_DEPENDENCIES += gst-plugins-base

endif



ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)

QT5MULTIMEDIA_DEPENDENCIES += qt5declarative

endif



define QT5MULTIMEDIA_CONFIGURE_CMDS

	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)

endef