Shouldn't this be split into two commits, one that fixes EXTRA_OECONF,
and one that fixes the qt5 support?
Also, are we sure that meson's qt5 moc/rcc/uic autodetection won't cause
any problems in OE?
Typically, we disable such "automagical" detections to ensure
deterministic builds.
On 06.02.20 08:53, Anuj Mittal wrote:
Use the correct variable so options actually get used.
qt5 support is currently automagically detected with meson and having an
explicit disabled doesn't do anything. Remove it so it can be handled
in qt layer with appropriate DEPENDS added.
Signed-off-by: Anuj Mittal <[email protected]>
---
.../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb
index a6eb9986dd..e78162172a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb
@@ -50,12 +50,12 @@ 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).
+# qt5 support is disabled by default unless dependencies are present. Enabling
it 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_OECONF += " \
+EXTRA_OEMESON += " \
-Daalib=disabled \
-Ddirectsound=disabled \
-Ddv=disabled \
@@ -64,7 +64,6 @@ EXTRA_OECONF += " \
-Doss4=disabled \
-Dosxaudio=disabled \
-Dosxvideo=disabled \
- -Dqt=disabled \
-Dshout2=disabled \
-Dtwolame=disabled \
-Dwaveform=disabled \
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
