summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2022-11-07 08:23:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-07 21:57:21 +0000
commitf494d47e6501f86a3c45dc0f2f50afa527ccebb2 (patch)
treed1ce836d78d11a24e9a12f217db9bdadb92c19b7 /meta
parent3a7dd1d36891d76c5160e11b39ad85a3cbd69e68 (diff)
downloadpoky-f494d47e6501f86a3c45dc0f2f50afa527ccebb2.tar.gz
gstreamer1.0-plugins-good: use libsoup-3.0 by default
- add a PACKAGECONFIG for soup3 - add PACKAGECONFIG_SOUP variable as it is used in webkitgtk and epiphany (From OE-Core rev: 88d30848981db2cb7b1f2021ba07e40976cd789f) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.bb10
1 files 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..9dd629eaa0 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"
20RPROVIDES:${PN}-pulseaudio += "${PN}-pulse" 20RPROVIDES:${PN}-pulseaudio += "${PN}-pulse"
21RPROVIDES:${PN}-soup += "${PN}-souphttpsrc" 21RPROVIDES:${PN}-soup += "${PN}-souphttpsrc"
22 22
23PACKAGECONFIG_SOUP ?= "soup3"
24
23PACKAGECONFIG ??= " \ 25PACKAGECONFIG ??= " \
24 ${GSTREAMER_ORC} \ 26 ${GSTREAMER_ORC} \
27 ${PACKAGECONFIG_SOUP} \
25 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ 28 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
26 ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \ 29 ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'asm', '', d)} \
27 bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \ 30 bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 speex taglib v4l2 \
28" 31"
29 32
30X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" 33X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
@@ -53,8 +56,9 @@ PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative q
53# instead of linking to it. And instead of using the default libsoup C headers, it 56# instead of linking to it. And instead of using the default libsoup C headers, it
54# uses its own stub header. Consequently, objdump will not show the libsoup .so as 57# uses its own stub header. Consequently, objdump will not show the libsoup .so as
55# a dependency, and libsoup won't be added to an image. Fix this by setting libsoup 58# a dependency, and libsoup won't be added to an image. Fix this by setting libsoup
56# as RDEPEND instead of DEPEND. 59# as RDEPEND.
57PACKAGECONFIG[soup] = "-Dsoup=enabled,-Dsoup=disabled,,libsoup-2.4" 60PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,libsoup-2.4,,soup3"
61PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,libsoup,,soup2"
58PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" 62PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex"
59PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" 63PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland"
60PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" 64PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"