From patchwork Wed Oct 4 16:09:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cord-Landwehr X-Patchwork-Id: 31685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44041E7C4DC for ; Wed, 4 Oct 2023 16:09:25 +0000 (UTC) Received: from letterbox.kde.org (letterbox.kde.org [46.43.1.242]) by mx.groups.io with SMTP id smtpd.web10.22921.1696435758994361275 for ; Wed, 04 Oct 2023 09:09:19 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@kde.org header.s=users header.b=LczY2JqJ; spf=pass (domain: kde.org, ip: 46.43.1.242, mailfrom: cordlandwehr@kde.org) Received: from behemoth.fritz.box (p200300e27f452f00ef8008d29b6d07c4.dip0.t-ipconnect.de [IPv6:2003:e2:7f45:2f00:ef80:8d2:9b6d:7c4]) (Authenticated sender: cordlandwehr) by letterbox.kde.org (Postfix) with ESMTPSA id CE4F932CCC6; Wed, 4 Oct 2023 17:09:15 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kde.org; s=users; t=1696435756; bh=Ywm+Rtk4YfWcbnAuhDUWWzZi7A9YCfuXH40b03tZh7k=; h=From:To:Cc:Subject:Date:From; b=LczY2JqJJ7vKitDtE63+w87ivBKoTt48itE1b2Eg1imK8ie2FvSUJhmohkezQa3VN lKG3vmD0825/6ESgq4N6a+wsbqWpy+RisSphqcM2Y1PBTSoL60m6PsDXq0PEhoaPTk tW/g9nno8wshq2GeVqARKbSvky7oMLZBYC41PkbcCbxBtIL89BUKK3o0jUDBGLylvu x5QQHYGEPtvQ+vRZTXNZrND9oIh+nKYFSq/KKTdaAPj8UhtHutJY8W4hiKV/5Z15+t 2AtE0fUbXYqGHrewS8L5MAQE7CY3iwKIbHIkCuCVS3GS4O/x7vOn85Vqh3KxRxaglt 6zIOY8FTKt7iw== From: Andreas Cord-Landwehr To: openembedded-core@lists.openembedded.org Cc: Andreas Cord-Landwehr Subject: [PATCH] gstreamer1.0-plugins-good: Provide Qt6 option for qmlgl Date: Wed, 4 Oct 2023 18:09:11 +0200 Message-Id: <20231004160911.3030063-1-cordlandwehr@kde.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 04 Oct 2023 16:09:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188689 Gstreamer release 1.22.0 introduced option for Qt6 API. Signed-off-by: Andreas Cord-Landwehr --- .../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} +}