From 62ec484190f51b265606ab1937a5245ddb68eee6 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 21 Feb 2020 10:41:58 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins-good_1.16.2.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'meta/recipes-multimedia') 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 \ -- cgit 1.2.3-korg