Skip to contentSkip to conversation

gstreamer: make pulseaudio support dependent on DISTRO_FEATURES

PATCH Superseded Paul Eggleton 2 participants 7 messages Sep 26, 2012

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gstreamer: make pulseaudio support dependent on DISTRO_FEATURES

This should be no change to the previous situation unless you explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED (currently).

---
 .../gstreamer/gst-plugins-good_0.10.31.bb          |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +6 -3
index 641de7c..07fda87 100644
@@ -6,15 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
 
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \
-	    speex libsoup-2.4 pulseaudio"
-PR = "r5"
+            speex libsoup-2.4 \
+            ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
+
+PR = "r6"
 
 inherit gettext gconf
 
 SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
 
 EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \
-                 --disable-orc --disable-examples"
+                 --disable-orc --disable-examples \
+                 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulse', '--disable-pulse', d)}"
 
 do_configure_prepend() {
 	# This m4 file contains nastiness which conflicts with libtool 2.2.2
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 3 lines · Paul Eggleton

This should be no change to the previous situation unless you explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED (currently).

Why not use PACKAGECONFIG for this?

Cheers,

Quoted 40 lines
---
 .../gstreamer/gst-plugins-good_0.10.31.bb          |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +6 -3
index 641de7c..07fda87 100644
@@ -6,15 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
 
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \
-	    speex libsoup-2.4 pulseaudio"
-PR = "r5"
+            speex libsoup-2.4 \
+            ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
+
+PR = "r6"
 
 inherit gettext gconf
 
 SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
 
 EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \
-                 --disable-orc --disable-examples"
+                 --disable-orc --disable-examples \
+                 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulse', '--disable-pulse', d)}"
 
 do_configure_prepend() {
 	# This m4 file contains nastiness which conflicts with libtool 2.2.2
Signature · 7 lines
1.7.9.5


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 6 lines · On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote:
Quoted 3 lines · Paul Eggleton

This should be no change to the previous situation unless you explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED (currently).

Why not use PACKAGECONFIG for this?

Only because I didn't see the need complicate it just to be able to configure it on a per-recipe basis - you almost certainly want pulseaudio either on or off everywhere. If you want it for stylistic reasons, sure, I guess... it is a bit ugly though.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#3 lore raw
Quoted 6 lines · Paul Eggleton
Quoted 5 lines · On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote:
Quoted 3 lines · Paul Eggleton

This should be no change to the previous situation unless you explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED (currently).

Quoted 6 lines
Quoted 1 line

Why not use PACKAGECONFIG for this?

Only because I didn't see the need complicate it just to be able to configure it on a per-recipe basis - you almost certainly want pulseaudio either on or off everywhere. If you want it for stylistic reasons, sure, I guess... it is a bit ugly though.

Well it looked to me like ideal use-case for PACKAGECONFIG.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw
Quoted 7 lines · On Wednesday 26 September 2012 14:32:57 Martin Jansa wrote:
Quoted 6 lines · Paul Eggleton
Quoted 5 lines · On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote:
Quoted 3 lines · Paul Eggleton

This should be no change to the previous situation unless you explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED (currently).

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

Why not use PACKAGECONFIG for this?

Only because I didn't see the need complicate it just to be able to configure it on a per-recipe basis - you almost certainly want pulseaudio either on or off everywhere. If you want it for stylistic reasons, sure, I guess... it is a bit ugly though.

Well it looked to me like ideal use-case for PACKAGECONFIG.

It does encapsulate the DEPENDS and EXTRA_OECONF into one piece, yes, but then when you make the PACKAGECONFIG option set from DISTRO_FEATURES anyway it gets ugly, and here I'm not convinced it adds anything useful.

FWIW, this also matches how the same configuration is implemented for Qt. If we want to switch everything over to PACKAGECONFIG later we can with no penalty.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#5 lore raw
Quoted 15 lines · Paul Eggleton
Quoted 14 lines · On Wednesday 26 September 2012 14:32:57 Martin Jansa wrote:
Quoted 12 lines · Paul Eggleton
Quoted 6 lines · On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote:
Quoted 3 lines · Paul Eggleton

This should be no change to the previous situation unless you explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED (currently).

Why not use PACKAGECONFIG for this?

Only because I didn't see the need complicate it just to be able to configure it on a per-recipe basis - you almost certainly want pulseaudio either on or off everywhere. If you want it for stylistic reasons, sure, I guess... it is a bit ugly though.

Quoted 5 lines
Quoted 1 line

Well it looked to me like ideal use-case for PACKAGECONFIG.

It does encapsulate the DEPENDS and EXTRA_OECONF into one piece, yes, but then when you make the PACKAGECONFIG option set from DISTRO_FEATURES anyway it gets ugly, and here I'm not convinced it adds anything useful.

Yes, but that's the case for almost every other PACKAGECONFIG use in oe-core too AFAIK and I was asked to convert similar commit to use PACKAGECONFIG before so I was expecting that the ultimate goal is to replace all such DISTRO_FEATURE tests with PACKAGECONFIG where possible, not to add more of them.

Cheers,

Quoted 10 lines

FWIW, this also matches how the same configuration is implemented for Qt. If we want to switch everything over to PACKAGECONFIG later we can with no penalty.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#6 lore raw
Quoted 24 lines · On Wednesday 26 September 2012 15:30:13 Martin Jansa wrote:
Quoted 17 lines · Paul Eggleton
Quoted 16 lines · On Wednesday 26 September 2012 14:32:57 Martin Jansa wrote:
Quoted 14 lines · Paul Eggleton
Quoted 6 lines · On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote:
Quoted 3 lines · Paul Eggleton

This should be no change to the previous situation unless you explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED (currently).

Why not use PACKAGECONFIG for this?

Only because I didn't see the need complicate it just to be able to configure it on a per-recipe basis - you almost certainly want pulseaudio
either on or off everywhere. If you want it for stylistic reasons, sure,
I guess... it is a bit ugly though.

Quoted 5 lines
Quoted 1 line

Well it looked to me like ideal use-case for PACKAGECONFIG.

It does encapsulate the DEPENDS and EXTRA_OECONF into one piece, yes, but then when you make the PACKAGECONFIG option set from DISTRO_FEATURES anyway it gets ugly, and here I'm not convinced it adds anything useful.

Quoted 5 lines

Yes, but that's the case for almost every other PACKAGECONFIG use in oe-core too AFAIK and I was asked to convert similar commit to use PACKAGECONFIG before so I was expecting that the ultimate goal is to replace all such DISTRO_FEATURE tests with PACKAGECONFIG where possible, not to add more of them.

Perhaps. Well, I just noticed I need to correct the commit message anyway (it's a change to gst-plugins-good, not gstreamer) so given that I'll send a v2 using PACKAGECONFIG.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre