Re: [OE-core] [PATCH] gstreamer1.0-plugins-good: Provide Qt6 option for qmlgl

[Andreas Cord-Landwehr]

On 04.10.23 20:10, Khem Raj wrote:
On Wed, Oct 4, 2023 at 9:09 AM Andreas Cord-Landwehr
<cordlandw...@kde.org> wrote:

Gstreamer release 1.22.0 introduced option for Qt6 API.

Signed-off-by: Andreas Cord-Landwehr <cordlandw...@kde.org>
---
  .../gstreamer/gstreamer1.0-plugins-good_1.22.5.bb      | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.bb 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.bb
index 93f0e76ee9..ca1e1d6046 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.bb
@@ -35,7 +35,7 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes 
libxdamage"
  X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled 
-Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled"
  X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled 
-Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled"

-QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", 
"", d)}"
+QTWAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", 
"", d)}"

  PACKAGECONFIG[asm]        = "-Dasm=enabled,-Dasm=disabled,nasm-native"
  PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
@@ -52,7 +52,8 @@ 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 ${QT5WAYLANDDEPENDS}"
+PACKAGECONFIG[qt5]        = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative 
qtbase-native ${QTWAYLANDDEPENDS}"
+PACKAGECONFIG[qt6]        = "-Dqt6=enabled,-Dqt6=disabled,qtbase qtdeclarative 
qtbase-native qttools-native ${QTWAYLANDDEPENDS}"
  PACKAGECONFIG[soup2]      = "-Dsoup=enabled,,libsoup-2.4,,,soup3"
  PACKAGECONFIG[soup3]      = "-Dsoup=enabled,,libsoup,,,soup2"
  PACKAGECONFIG[speex]      = "-Dspeex=enabled,-Dspeex=disabled,speex"
@@ -79,3 +80,8 @@ EXTRA_OEMESON += " \
  "

  FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
+
+do_configure:prepend() {
+    # provide path to qtwaylandscanner
+    export PATH=${PATH}:${STAGING_DIR_NATIVE}/${libexecdir}

perhaps we should fix naitve qt6 to install qtwaylandscanner in native
bindir. Then we do not need this.

Hi, I brought this up recently in a different discussion

https://bugreports.qt.io/browse/QTBUG-116998

My understanding is that the move was deliberate and the expectation is 
that everybody uses the CMake macros with internal path logic; however, 
that fails when not using CMake like here with Meson.


+}
--
2.39.2




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188695): 
https://lists.openembedded.org/g/openembedded-core/message/188695
Mute This Topic: https://lists.openembedded.org/mt/101758538/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-