[PATCH 2/3] pulseaudio: upgrade to 2.0

[Cristian Iorga <cristian.iorga@intel.com>]

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../{libcanberra_0.28.bb => libcanberra_0.29.bb}   |   14 +++++++-------
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    2 +-
 .../{pulseaudio_1.1.bb => pulseaudio_2.0.bb}       |    7 +++----
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename meta/recipes-multimedia/pulseaudio/{libcanberra_0.28.bb => libcanberra_0.29.bb} (76%)
 rename meta/recipes-multimedia/pulseaudio/{pulseaudio_1.1.bb => pulseaudio_2.0.bb} (64%)

diff --git a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb
similarity index 76%
rename from meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb
rename to meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb
index e69c89d..b3c0e3d 100644
--- a/meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb
+++ b/meta/recipes-multimedia/pulseaudio/libcanberra_0.29.bb
@@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03"
 
 DEPENDS = "gtk+ pulseaudio alsa-lib libtool libvorbis"
-PR = "r1"
+PR = "r0"
 
 inherit gconf autotools
 
-SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz"
+SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "c198b4811598c4c161ff505e4531b02c"
-SRC_URI[sha256sum] = "eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c"
+SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8"
+SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72"
 
 EXTRA_OECONF = " --disable-oss --disable-ltdl-install" 
 
@@ -25,8 +25,8 @@ PACKAGES += "${PN}-gnome"
 FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome"
 FILES_${PN}-gnome += "${datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop \
 	              ${libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop"
-FILES_${PN}-dev += "${libdir}/libcanberra-0.28/libcanberra-*.so \
-		    ${libdir}/libcanberra-0.28/libcanberra-*.la \
+FILES_${PN}-dev += "${libdir}/libcanberra-0.29/libcanberra-*.so \
+		    ${libdir}/libcanberra-0.29/libcanberra-*.la \
 		    ${datadir}/vala/vapi"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-0.28/.debug"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/libcanberra-0.29/.debug"
 
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index c3d6d98..cd09940 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -6,7 +6,7 @@ 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/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
+                    file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95"
 DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
            ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
 # optional
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb
similarity index 64%
rename from meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
rename to meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb
index e88a3a5..7e57e5e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r10"
+PR = "r0"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
 
@@ -8,11 +8,10 @@ inherit gettext perlnative
 
 SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
   file://volatiles.04_pulse \
-  file://pulseaudio_fix_for_x32.patch \
 "
 
-SRC_URI[md5sum] = "17d21df798cee407b769c6355fae397a"
-SRC_URI[sha256sum] = "6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee"
+SRC_URI[md5sum] = "9bbde657c353fe675c3b693054175a8e"
+SRC_URI[sha256sum] = "28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061"
 
 do_compile_prepend() {
     cd ${S}
-- 
1.7.9.5