Skip to contentSkip to conversation

gstreamer1.0-meta-base: Don't use COMBINED_FEATURES

PATCH In review Richard Purdie 2 participants 2 messages Feb 12, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gstreamer1.0-meta-base: Don't use COMBINED_FEATURES

http://git.openembedded.org/openembedded-core/commit/?id=948165dce7475b815a344fd3c3d58165e6865d48
makes gstreamer1.0-plugins-base-alsa depend on COMBINED_FEATURES.

This is an allarch recipe so this only works if all your machines have the same MACHINE_FEATURES and not all do.

Instead make this an unconditional RRECOMMEND, its a PACKAGES_DYNAMIC so this should all work out for everyone's use cases.

meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb +4 -1
index ecfd082..9d1b9dc 100644
@@ -26,7 +26,6 @@ RDEPENDS_gstreamer1.0-meta-base = "\
     gstreamer1.0 \
     gstreamer1.0-plugins-base-playback \
     gstreamer1.0-plugins-base-gio \
-    ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '',d)} \
     gstreamer1.0-plugins-base-volume \
     gstreamer1.0-plugins-base-audioconvert \
     gstreamer1.0-plugins-base-audioresample \
@@ -36,6 +35,10 @@ RDEPENDS_gstreamer1.0-meta-base = "\
     gstreamer1.0-plugins-good-autodetect \
     gstreamer1.0-plugins-good-souphttpsrc"
 
+RRECOMMENDS_gstreamer1.0-meta-base = "\
+    gstreamer1.0-plugins-base-alsa \
+"
+
 RRECOMMENDS_gstreamer1.0-meta-x11-base = "\
     gstreamer1.0-plugins-base-ximagesink \
     gstreamer1.0-plugins-base-xvimagesink"
#1 lore raw
Quoted 5 lines · Richard Purdie

http://git.openembedded.org/openembedded-core/commit/?id=948165dce7475b815a344fd3c3d58165e6865d48
makes gstreamer1.0-plugins-base-alsa depend on COMBINED_FEATURES.

This is an allarch recipe so this only works if all your machines have the same MACHINE_FEATURES and not all do.

Good point. The recipe should set PACKAGE_ARCH = "${MACHINE_ARCH}" (as packagegroup-base.bb does).

Quoted 2 lines

Instead make this an unconditional RRECOMMEND, its a PACKAGES_DYNAMIC so this should all work out for everyone's use cases.

I have some machines which need the alsa plug-in and some machines where it must not be installed. The alsa DISTRO feature alone is not fine grained enough to handle that.

Quoted 27 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb +4 -1
index ecfd082..9d1b9dc 100644
@@ -26,7 +26,6 @@ RDEPENDS_gstreamer1.0-meta-base = "\
     gstreamer1.0 \
     gstreamer1.0-plugins-base-playback \
     gstreamer1.0-plugins-base-gio \
-    ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '',d)} \
     gstreamer1.0-plugins-base-volume \
     gstreamer1.0-plugins-base-audioconvert \
     gstreamer1.0-plugins-base-audioresample \
@@ -36,6 +35,10 @@ RDEPENDS_gstreamer1.0-meta-base = "\
     gstreamer1.0-plugins-good-autodetect \
     gstreamer1.0-plugins-good-souphttpsrc"
 
+RRECOMMENDS_gstreamer1.0-meta-base = "\
+    gstreamer1.0-plugins-base-alsa \
+"
+
 RRECOMMENDS_gstreamer1.0-meta-x11-base = "\
     gstreamer1.0-plugins-base-ximagesink \
     gstreamer1.0-plugins-base-xvimagesink"