aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-02-21 10:41:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-21 17:46:46 +0000
commit62ec484190f51b265606ab1937a5245ddb68eee6 (patch)
treed0397db8e962c4e3790999c54a7c3ad1dd0e0aa7 /meta/recipes-multimedia
parentfbaf9afcbeb031860c249d73650649f8d032310d (diff)
downloadopenembedded-core-contrib-62ec484190f51b265606ab1937a5245ddb68eee6.tar.gz
openembedded-core-contrib-62ec484190f51b265606ab1937a5245ddb68eee6.tar.bz2
openembedded-core-contrib-62ec484190f51b265606ab1937a5245ddb68eee6.zip
gstreamer1.0-plugins-good: add qt5 PACKAGECONFIG
Instead of disabling unconditionally, add PACKAGECONFIG for qt5. Imported from meta-qt5 layer. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb7
1 files changed, 1 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb
index f3e0ceed50..8b34111d38 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb
@@ -42,6 +42,7 @@ PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng"
PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils"
PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
+PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native"
PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4"
PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex"
PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
@@ -50,11 +51,6 @@ PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx"
PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
-# qt5 support is disabled, because it is not present in OE core, and requires more work than
-# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
-# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig
-# in a gstreamer1.0-plugins-good bbappend).
-
EXTRA_OEMESON += " \
-Daalib=disabled \
-Ddirectsound=disabled \
@@ -64,7 +60,6 @@ EXTRA_OEMESON += " \
-Doss4=disabled \
-Dosxaudio=disabled \
-Dosxvideo=disabled \
- -Dqt5=disabled \
-Dshout2=disabled \
-Dtwolame=disabled \
-Dwaveform=disabled \