From 376a27c932db85e665f9532347e8432e46861880 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 15 Jan 2023 10:25:11 -0600 Subject: gstreamer1.0-plugins-good: Fix libsoup runtime dependency The runtime dependency on libsoup set via PACKAGECONFIG does not work. The problem is the dependency is placed on the main package, but the soup package has no dependency on the main package. I considered modifying the call to do_split_packages from gstreamer1.0-plugins-packaging.inc, changing extra_depends from '' to None: ``` extra_depends -- extra runtime dependencies (RDEPENDS) to be set for all packages. The default value of None causes a dependency on the main package (${PN}) - if you do not want this, pass '' for this parameter. ``` However, the problem with this solution is that it does add the runtime dependency to _all_ such split packages. So, fix the problem with an explicit runtime dependency. (From OE-Core rev: 56c4559788d3d87ceed965aedd03d461df5999aa) Signed-off-by: Tom Hochstein Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins-good_1.20.5.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb index f7ade89ef8..0bd953743e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb @@ -19,6 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ DEPENDS += "gstreamer1.0-plugins-base libcap zlib" RPROVIDES:${PN}-pulseaudio += "${PN}-pulse" RPROVIDES:${PN}-soup += "${PN}-souphttpsrc" +RDEPENDS:${PN}-soup += "${MLPREFIX}${@bb.utils.contains('PACKAGECONFIG', 'soup2', 'libsoup-2.4', 'libsoup', d)}" PACKAGECONFIG_SOUP ?= "soup3" @@ -52,13 +53,8 @@ PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l- 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}" -# Starting with version 1.20, the GStreamer soup plugin loads libsoup with dlopen() -# 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. -PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,libsoup-2.4,,soup3" -PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,libsoup,,soup2" +PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" -- cgit v1.2.3-54-g00ecf