diff options
| author |   Markus Volk <f_l_k@t-online.de> | 2022-11-07 08:23:24 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-07 21:56:33 +0000 |
| commit | 88d30848981db2cb7b1f2021ba07e40976cd789f (patch) | |
| tree | 6429fd0830b068a66d3766d9fa346f028ca920e7 /meta | |
| parent | 18624a89cb09bab78f9200a7c63406c75845e3e3 (diff) | |
| download | openembedded-core-88d30848981db2cb7b1f2021ba07e40976cd789f.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
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.bb | 10 |
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" 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,,libsoup-2.4,libsoup-2.4,,soup3" +PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,libsoup,,soup2" PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland" PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" |