Patchwork pulseaudio: Upgrade 4.0 -> 5.0

login
register
mail settings
Submitter Khem Raj
Date March 11, 2014, 5:36 p.m.
Message ID <1394559360-27718-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/68439/
State New
Headers show

Comments

Khem Raj - March 11, 2014, 5:36 p.m.
bluetooth-proximity has been removed in 5.0

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc                    | 2 --
 .../pulseaudio/{pulseaudio_4.0.bb => pulseaudio_5.0.bb}              | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)
 rename meta/recipes-multimedia/pulseaudio/{pulseaudio_4.0.bb => pulseaudio_5.0.bb} (63%)
Ross Burton - March 18, 2014, 3:51 p.m.
On 11 March 2014 17:36, Khem Raj <raj.khem@gmail.com> wrote:
> bluetooth-proximity has been removed in 5.0

This brings in a new QA warning:

WARNING: QA Issue: pulseaudio: configure was passed unrecognised
options: --enable-bluez

Ross
Khem Raj - March 18, 2014, 5:07 p.m.
On Tue, Mar 18, 2014 at 8:51 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 11 March 2014 17:36, Khem Raj <raj.khem@gmail.com> wrote:
>> bluetooth-proximity has been removed in 5.0
>
> This brings in a new QA warning:
>
> WARNING: QA Issue: pulseaudio: configure was passed unrecognised
> options: --enable-bluez

yeah now it differentiates between bluez4 and bluez5 so the options
are also renamed
accordingly. I have sent a v2

>
> Ross
Richard Purdie - March 18, 2014, 11:08 p.m.
On Tue, 2014-03-18 at 10:07 -0700, Khem Raj wrote:
> On Tue, Mar 18, 2014 at 8:51 AM, Burton, Ross <ross.burton@intel.com> wrote:
> > On 11 March 2014 17:36, Khem Raj <raj.khem@gmail.com> wrote:
> >> bluetooth-proximity has been removed in 5.0
> >
> > This brings in a new QA warning:
> >
> > WARNING: QA Issue: pulseaudio: configure was passed unrecognised
> > options: --enable-bluez
> 
> yeah now it differentiates between bluez4 and bluez5 so the options
> are also renamed
> accordingly. I have sent a v2

Did you sent the right patch?

Cheers,

Richard
Khem Raj - March 18, 2014, 11:11 p.m.
i think so look for v2

-Khem
On Mar 18, 2014 4:08 PM, "Richard Purdie" <
richard.purdie@linuxfoundation.org> wrote:

> On Tue, 2014-03-18 at 10:07 -0700, Khem Raj wrote:
> > On Tue, Mar 18, 2014 at 8:51 AM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > > On 11 March 2014 17:36, Khem Raj <raj.khem@gmail.com> wrote:
> > >> bluetooth-proximity has been removed in 5.0
> > >
> > > This brings in a new QA warning:
> > >
> > > WARNING: QA Issue: pulseaudio: configure was passed unrecognised
> > > options: --enable-bluez
> >
> > yeah now it differentiates between bluez4 and bluez5 so the options
> > are also renamed
> > accordingly. I have sent a v2
>
> Did you sent the right patch?
>
> Cheers,
>
> Richard
>
>
Khem Raj - March 18, 2014, 11:13 p.m.
These two

http://patchwork.openembedded.org/patch/68851/
http://patchwork.openembedded.org/patch/68853/


On Tue, Mar 18, 2014 at 4:11 PM, Khem Raj <raj.khem@gmail.com> wrote:
> i think so look for v2
>
> -Khem
>
> On Mar 18, 2014 4:08 PM, "Richard Purdie"
> <richard.purdie@linuxfoundation.org> wrote:
>>
>> On Tue, 2014-03-18 at 10:07 -0700, Khem Raj wrote:
>> > On Tue, Mar 18, 2014 at 8:51 AM, Burton, Ross <ross.burton@intel.com>
>> > wrote:
>> > > On 11 March 2014 17:36, Khem Raj <raj.khem@gmail.com> wrote:
>> > >> bluetooth-proximity has been removed in 5.0
>> > >
>> > > This brings in a new QA warning:
>> > >
>> > > WARNING: QA Issue: pulseaudio: configure was passed unrecognised
>> > > options: --enable-bluez
>> >
>> > yeah now it differentiates between bluez4 and bluez5 so the options
>> > are also renamed
>> > accordingly. I have sent a v2
>>
>> Did you sent the right patch?
>>
>> Cheers,
>>
>> Richard
>>
>

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 103f72e..3d35b6b 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -5,7 +5,6 @@  SECTION = "libs/multimedia"
 LICENSE = "GPLv2+ & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
                     file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
                     file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95"
 
 DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool"
@@ -145,7 +144,6 @@  RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
 RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
 
 FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"
-FILES_pulseaudio-module-bluetooth-proximity += "${libexecdir}/pulse/proximity-helper"
 FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
 
 RDEPENDS_pulseaudio-server += "\
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb
similarity index 63%
rename from meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb
rename to meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb
index b419c54..f02359a 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb
@@ -2,9 +2,8 @@  require pulseaudio.inc
 
 SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
            file://volatiles.04_pulse"
-
-SRC_URI[md5sum] = "591f211db2790a7e4d222f2dc6858db3"
-SRC_URI[sha256sum] = "35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae"
+SRC_URI[md5sum] = "c43749838612f4860465e83ed62ca38e"
+SRC_URI[sha256sum] = "99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939"
 
 do_compile_prepend() {
     mkdir -p ${S}/libltdl