[oe-core][PATCH 1/2] epiphany: use libsoup-3.0 by default

[oe-core][PATCH 1/2] epiphany: use libsoup-3.0 by default

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 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
-- 
2.34.1

[oe-core][PATCH 2/2] gstreamer1.0-plugins-good: use libsoup-3.0 by default

[Markus Volk]

- add a PACKAGECONFIG for soup3
- add PACKAGECONFIG_SOUP variable as it is used in webkitgtk and epiphany

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../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"
-- 
2.34.1

Re: [oe-core][PATCH 2/2] gstreamer1.0-plugins-good: use libsoup-3.0 by default

[Alexandre Belloni]

Hello,

This causes the following warning:

WARNING: gstreamer1.0-meta-base-1.0-r0 do_package_qa: QA Issue: gstreamer1.0-meta-base rdepends on gstreamer1.0-plugins-good-soup, but it isn't a build dependency? [build-deps]

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/6120/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/6124/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/6107/steps/11/logs/stdio

On 06/11/2022 09:02:49+0100, Markus Volk wrote:
> - add a PACKAGECONFIG for soup3
> - add PACKAGECONFIG_SOUP variable as it is used in webkitgtk and epiphany
> 
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../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"
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#172761): https://lists.openembedded.org/g/openembedded-core/message/172761
> Mute This Topic: https://lists.openembedded.org/mt/94840953/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [oe-core][PATCH 2/2] gstreamer1.0-plugins-good: use libsoup-3.0 by default

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 400 bytes --]

Am So, 6. Nov 2022 um 23:12:40 +0100 schrieb Alexandre Belloni via 
lists.openembedded.org 
<alexandre.belloni=bootlin.com@lists.openembedded.org>:
> WARNING: gstreamer1.0-meta-base-1.0-r0 do_package_qa: QA Issue: 
> gstreamer1.0-meta-base rdepends on gstreamer1.0-plugins-good-soup, 
> but it isn't a build dependency? [build-deps]

Hello,

i've sent a v2 for this patch that should fix the issue.


[-- Attachment #2: Type: text/html, Size: 584 bytes --]