From patchwork Sun Nov 6 08:02:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 14959 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 DB541C4332F for ; Sun, 6 Nov 2022 08:03:09 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web12.14293.1667721780625845816 for ; Sun, 06 Nov 2022 01:03:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout04.t-online.de (Postfix) with SMTP id 4037588B5 for ; Sun, 6 Nov 2022 09:02:58 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([79.219.228.48]) by fwd79.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1oracL-2bdjQf0; Sun, 6 Nov 2022 09:02:57 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCH 1/2] epiphany: use libsoup-3.0 by default Date: Sun, 6 Nov 2022 09:02:48 +0100 Message-Id: <20221106080249.89929-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1667721777-0A697417-98F616C9/0/0 CLEAN NORMAL X-TOI-MSGID: dba8c1e6-ff75-44bf-8a02-2dff3d7bef87 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 ; Sun, 06 Nov 2022 08:03:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172760 Signed-off-by: Markus Volk --- meta/recipes-gnome/epiphany/epiphany_42.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/epiphany/epiphany_42.4.bb b/meta/recipes-gnome/epiphany/epiphany_42.4.bb index 9efd2800da..afaaefc46f 100644 --- a/meta/recipes-gnome/epiphany/epiphany_42.4.bb +++ b/meta/recipes-gnome/epiphany/epiphany_42.4.bb @@ -30,7 +30,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN " SRC_URI[archive.sha256sum] = "370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860" -PACKAGECONFIG_SOUP ?= "soup2" +PACKAGECONFIG_SOUP ?= "soup3" PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" # Developer mode enables debugging From patchwork Sun Nov 6 08:02:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 14960 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 DC4BBC43217 for ; Sun, 6 Nov 2022 08:03:09 +0000 (UTC) Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by mx.groups.io with SMTP id smtpd.web10.14413.1667721786329856979 for ; Sun, 06 Nov 2022 01:03:06 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.17, mailfrom: f_l_k@t-online.de) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout02.t-online.de (Postfix) with SMTP id 4596142D8 for ; Sun, 6 Nov 2022 09:03:04 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([79.219.228.48]) by fwd79.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1oracP-2bdjQg0; Sun, 6 Nov 2022 09:03:01 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCH 2/2] gstreamer1.0-plugins-good: use libsoup-3.0 by default Date: Sun, 6 Nov 2022 09:02:49 +0100 Message-Id: <20221106080249.89929-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221106080249.89929-1-f_l_k@t-online.de> References: <20221106080249.89929-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1667721781-F37EF417-BEEAD82E/0/0 CLEAN NORMAL X-TOI-MSGID: 543442cf-4bf7-433e-9b62-816776dcedc7 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 ; Sun, 06 Nov 2022 08:03:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172761 - add a PACKAGECONFIG for soup3 - add PACKAGECONFIG_SOUP variable as it is used in webkitgtk and epiphany Signed-off-by: Markus Volk --- .../gstreamer/gstreamer1.0-plugins-good_1.20.3.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.bb index 0235935a4a..6d90fd5213 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.bb @@ -20,11 +20,14 @@ DEPENDS += "gstreamer1.0-plugins-base libcap zlib" RPROVIDES:${PN}-pulseaudio += "${PN}-pulse" RPROVIDES:${PN}-soup += "${PN}-souphttpsrc" +PACKAGECONFIG_SOUP ?= "soup3" + PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ + ${PACKAGECONFIG_SOUP} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \ - bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \ + bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 speex taglib v4l2 \ " X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" @@ -53,8 +56,9 @@ PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative q # instead of linking to it. And instead of using the default libsoup C headers, it # uses its own stub header. Consequently, objdump will not show the libsoup .so as # a dependency, and libsoup won't be added to an image. Fix this by setting libsoup -# as RDEPEND instead of DEPEND. -PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,,libsoup-2.4" +# as RDEPEND. +PACKAGECONFIG[soup2] = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4,libsoup-2.4,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,libsoup,,soup2" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"