@@ -19,11 +19,9 @@ 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"
-
PACKAGECONFIG ??= " \
${GSTREAMER_ORC} \
- ${PACKAGECONFIG_SOUP} \
+ soup3 \
${@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 speex taglib v4l2 \
@@ -55,8 +53,7 @@ PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native qttools-native ${QT5WAYLANDDEPENDS}"
PACKAGECONFIG[qt6] = "-Dqt6=enabled,-Dqt6=disabled,qtbase qtdeclarative qtbase-native qttools-native ${QT6WAYLANDDEPENDS}"
-PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3"
-PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2"
+PACKAGECONFIG[soup3] = "-Dsoup=enabled,-Dsoup=disabled,libsoup"
PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex"
PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland"
PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
* libsoup-2.4 already removed in commit [1], so remove the soup2 PACKAGECONFIG, which may causes depeneds on libsoup-2.4 * provide soup3 option, enable soup3 will enable soup and soup version will be auto defected as libsoup3 since we depend on libsoup, disable soup3 will disable soup. [1] https://git.openembedded.org/openembedded-core/commit/?id=94ebc5b798aed6eea642c5e2a4df24b386520636 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- .../gstreamer/gstreamer1.0-plugins-good_1.26.9.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)