| Message ID | 1405791208-30356-2-git-send-email-fatih.asici@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Fatih Aşıcı, On Sat, 19 Jul 2014 20:33:23 +0300, Fatih Aşıcı wrote: > Also add missing dependencies on gui and network modules. > > Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> > --- > package/qt5/qt5multimedia/Config.in | 10 ++-------- > package/qt5/qt5multimedia/qt5multimedia.mk | 6 +++++- > 2 files changed, 7 insertions(+), 9 deletions(-) Applied, thanks. However, please do not send your patches to both buildroot@uclibc.org and buildroot@buildroot.org: they are the same mailing list, so your patches appear twice on the list. Thomas
On Sunday 20 July 2014 12:02:34 Thomas Petazzoni wrote: > Dear Fatih Aşıcı, > > On Sat, 19 Jul 2014 20:33:23 +0300, Fatih Aşıcı wrote: > > Also add missing dependencies on gui and network modules. > > > > Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> > > --- > > > > package/qt5/qt5multimedia/Config.in | 10 ++-------- > > package/qt5/qt5multimedia/qt5multimedia.mk | 6 +++++- > > 2 files changed, 7 insertions(+), 9 deletions(-) > > Applied, thanks. However, please do not send your patches to both > buildroot@uclibc.org and buildroot@buildroot.org: they are the same > mailing list, so your patches appear twice on the list. Sorry. I passed one mail address from the command line; but I have realized that .git/config file also has another address. I had added the latter for convenience but forgot it.
diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index c00491c..36128eb 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -1,10 +1,8 @@ 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 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 5eef543..e89e31c 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -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
Also add missing dependencies on gui and network modules. Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> --- package/qt5/qt5multimedia/Config.in | 10 ++-------- package/qt5/qt5multimedia/qt5multimedia.mk | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-)