Patchwork [v2,-CONSOLIDATED,PULL,06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES

login
register
mail settings
Submitter Saul Wold
Date Oct. 16, 2011, 8:17 p.m.
Message ID <bd5259c1b77e280bf7c076b50eedd0c3dc3424dc.1318796061.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/13321/
State New, archived
Headers show

Comments

Saul Wold - Oct. 16, 2011, 8:17 p.m.
From: Paul Eggleton <paul.eggleton@linux.intel.com>

If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on
bluez4, otherwise disable it.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
 .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
 .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
Martin Jansa - Oct. 18, 2011, 6:49 p.m.
On Sun, Oct 16, 2011 at 10:17 PM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Paul Eggleton <paul.eggleton@linux.intel.com>
>
> If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on
> bluez4, otherwise disable it.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
>  .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
>  .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
>  3 files changed, 5 insertions(+), 4 deletions(-)

It's not caused by this patch.. but if you're looking into pulseaudio,
can you also fix this:

Building man pages is using host perl and fails if there isn't
XML/Parser.pm on host:

| perl ./xmltoman default.pa.5.xml > default.pa.5 || rm -f default.pa.5
| Can't locate XML/Parser.pm in @INC (@INC contains: /etc/perl
/usr/lib64/perl5/site_perl/5.12.4/x86_64-linux
/usr/lib64/perl5/site_perl/5.12.4
/usr/lib64/perl5/vendor_perl/5.12.4/x86_64-linux
/usr/lib64/perl5/vendor_perl/5.12.4 /usr/lib
64/perl5/site_perl /usr/lib64/perl5/vendor_perl
/usr/lib64/perl5/5.12.4/x86_64-linux /usr/lib64/perl5/5.12.4
/usr/local/lib/site_perl .) at ./xmltoman line 21.
| BEGIN failed--compilation aborted at ./xmltoman line 21.
| test -z "/usr/share/man/man1" || /bin/mkdir -p
"/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1"
|  /usr/bin/install -c -m 644 ./pulseaudio.1 ./esdcompat.1
./pax11publish.1 ./paplay.1 ./pacat.1 ./pacmd.1 ./pactl.1
./pasuspender.1 ./padsp.1 ./pabrowse.1
'/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1'
| /usr/bin/install: cannot stat `./pulseaudio.1': No such file or directory
| /usr/bin/install: cannot stat `./esdcompat.1': No such file or directory
| /usr/bin/install: cannot stat `./pax11publish.1': No such file or directory
| /usr/bin/install: cannot stat `./paplay.1': No such file or directory
| /usr/bin/install: cannot stat `./pacat.1': No such file or directory
| /usr/bin/install: cannot stat `./pacmd.1': No such file or directory
| /usr/bin/install: cannot stat `./pactl.1': No such file or directory
| /usr/bin/install: cannot stat `./pasuspender.1': No such file or directory
| /usr/bin/install: cannot stat `./padsp.1': No such file or directory
| /usr/bin/install: cannot stat `./pabrowse.1': No such file or directory
| make[3]: *** [install-man1] Error 1
| make[3]: Leaving directory
`/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/pulseaudio-0.9.23/man'

inherit perlnative works for me as work around as it puts perl
perl-native in PATH before host perl and XML/Parser.pm is installed in
native sysroot, but maybe you'll find cleaner solution (maybe patching
Makefile to use env perl will be enough).

Regards,
Saul Wold - Oct. 18, 2011, 7:05 p.m.
On 10/18/2011 11:49 AM, Martin Jansa wrote:
> On Sun, Oct 16, 2011 at 10:17 PM, Saul Wold<sgw@linux.intel.com>  wrote:
>> From: Paul Eggleton<paul.eggleton@linux.intel.com>
>>
>> If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on
>> bluez4, otherwise disable it.
>>
>> Signed-off-by: Paul Eggleton<paul.eggleton@linux.intel.com>
>> ---
>>   meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
>>   .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
>>   .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
>>   3 files changed, 5 insertions(+), 4 deletions(-)
>
> It's not caused by this patch.. but if you're looking into pulseaudio,
> can you also fix this:
>
> Building man pages is using host perl and fails if there isn't
> XML/Parser.pm on host:
>
> | perl ./xmltoman default.pa.5.xml>  default.pa.5 || rm -f default.pa.5
> | Can't locate XML/Parser.pm in @INC (@INC contains: /etc/perl
> /usr/lib64/perl5/site_perl/5.12.4/x86_64-linux
> /usr/lib64/perl5/site_perl/5.12.4
> /usr/lib64/perl5/vendor_perl/5.12.4/x86_64-linux
> /usr/lib64/perl5/vendor_perl/5.12.4 /usr/lib
> 64/perl5/site_perl /usr/lib64/perl5/vendor_perl
> /usr/lib64/perl5/5.12.4/x86_64-linux /usr/lib64/perl5/5.12.4
> /usr/local/lib/site_perl .) at ./xmltoman line 21.
> | BEGIN failed--compilation aborted at ./xmltoman line 21.
> | test -z "/usr/share/man/man1" || /bin/mkdir -p
> "/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1"
> |  /usr/bin/install -c -m 644 ./pulseaudio.1 ./esdcompat.1
> ./pax11publish.1 ./paplay.1 ./pacat.1 ./pacmd.1 ./pactl.1
> ./pasuspender.1 ./padsp.1 ./pabrowse.1
> '/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1'
> | /usr/bin/install: cannot stat `./pulseaudio.1': No such file or directory
> | /usr/bin/install: cannot stat `./esdcompat.1': No such file or directory
> | /usr/bin/install: cannot stat `./pax11publish.1': No such file or directory
> | /usr/bin/install: cannot stat `./paplay.1': No such file or directory
> | /usr/bin/install: cannot stat `./pacat.1': No such file or directory
> | /usr/bin/install: cannot stat `./pacmd.1': No such file or directory
> | /usr/bin/install: cannot stat `./pactl.1': No such file or directory
> | /usr/bin/install: cannot stat `./pasuspender.1': No such file or directory
> | /usr/bin/install: cannot stat `./padsp.1': No such file or directory
> | /usr/bin/install: cannot stat `./pabrowse.1': No such file or directory
> | make[3]: *** [install-man1] Error 1
> | make[3]: Leaving directory
> `/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/pulseaudio-0.9.23/man'
>
> inherit perlnative works for me as work around as it puts perl
> perl-native in PATH before host perl and XML/Parser.pm is installed in
> native sysroot, but maybe you'll find cleaner solution (maybe patching
> Makefile to use env perl will be enough).
>
Martin,

Could you please file this as a bug in bugzilla.yoctoproject.org.

Thanks
	Sau!


> Regards,
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2a8e74d..bb32467 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -9,7 +9,8 @@  LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
                     file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
 DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11"
 # optional
-DEPENDS += "bluez4 udev alsa-lib glib-2.0 dbus consolekit"
+DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
+           ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
            file://gcc4-compile-fix.patch \
@@ -19,7 +20,7 @@  inherit autotools pkgconfig
 
 EXTRA_OECONF = "\
 		--disable-lynx \
-		--enable-bluez \
+		${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
 		--disable-polkit \
 		--with-x \
 		--without-jack \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
index da2e988..3067365 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
@@ -1,6 +1,6 @@ 
 require pulseaudio.inc
 
-PR = "r6"
+PR = "r7"
 
 DEPENDS += "gdbm speex"
 
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 1edd913..33f5e15 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -1,6 +1,6 @@ 
 require pulseaudio.inc
 
-PR = "r4"
+PR = "r5"
 
 DEPENDS += "gdbm speex"