From 5ae0c19310733e684adf331756bbab5622816596 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 12 Dec 2013 21:02:00 +0100 Subject: [PATCH] qt4: enable dbus, explicitly disable gstreamer and remove build dependency --- meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 5 +++-- meta-opendreambox/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend index dbaee2b2..59ed04e7 100644 --- a/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend +++ b/meta-opendreambox/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend @@ -1,3 +1,5 @@ +DEPENDS := "${@oe_filter_out('^(gstreamer|gst-plugins-base)$', '${DEPENDS}', d)}" + SRC_URI += "file://0001-Qt-remove-x11-from-npapi-while-keeping-some-basic-fu.patch \ file://0002-Qt-Add-HbbTv-MIME-types.patch \ file://0003-Qt-expose-WebKits-WebSecurityEnabled-setting.patch \ @@ -10,8 +12,7 @@ QT_CONFIG_FLAGS += "-nomake demos -nomake docs -nomake examples" QT_SQL_DRIVER_FLAGS = "-no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite2 -plugin-sql-sqlite -system-sqlite" QT_QT3SUPPORT = "-no-qt3support" QT_WEBKIT = "-webkit" -QT_PHONON = "-no-phonon" -QT_DBUS = "-no-qdbus" +QT_PHONON = "-no-gstreamer -no-phonon" QT_GLIB_FLAGS = "-no-glib" QT_IMAGEFORMAT_FLAGS += "-no-libmng" diff --git a/meta-opendreambox/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/meta-opendreambox/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend index acde00c6..7dd1c42e 100644 --- a/meta-opendreambox/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend +++ b/meta-opendreambox/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend @@ -1,4 +1,4 @@ -DEPENDS := "${@oe_filter_out('^(virtual/libgl)$', '${DEPENDS}', d)} virtual/libgles2" +DEPENDS := "${@oe_filter_out('^(gstreamer|gst-plugins-base|virtual/libgl)$', '${DEPENDS}', d)} virtual/libgles2" SRC_URI += "file://0002-Qt-Add-HbbTv-MIME-types.patch \ file://0003-Qt-expose-WebKits-WebSecurityEnabled-setting.patch \ @@ -10,8 +10,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qt4-${PV}:" QT_SQL_DRIVER_FLAGS += "-no-sql-sqlite2" QT_GLFLAGS = "-opengl es2" QT_QT3SUPPORT = "-no-qt3support" -QT_PHONON = "-no-phonon" -QT_DBUS = "-no-qdbus" +QT_PHONON = "-no-gstreamer -no-phonon" QT_CONFIG_FLAGS += " \ -nomake demos -nomake docs -nomake examples \ -no-gtkstyle \ -- 2.20.1