summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-03-18 10:04:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-21 12:05:54 +0000
commit35a49f696f3abe758ff8c6b4ae12583253fe7a22 (patch)
treeabaf65df43fb233fdc056919f860c8cdcff3150d
parentda4c46fc78abcd386ea523c3f9c8d35d445c25e3 (diff)
downloadpoky-35a49f696f3abe758ff8c6b4ae12583253fe7a22.tar.gz
pulseaudio: Upgrade 4.0 -> 5.0
bluetooth-proximity has been removed in 5.0 pulseaudio now differentiates between bluez4 and bluez5 (From OE-Core rev: c53d3a4f1f2d42437dc2985fe109039c843aa4dc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc7
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb (renamed from meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb)5
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 103f72ec8c..217673163c 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -5,7 +5,6 @@ SECTION = "libs/multimedia"
5LICENSE = "GPLv2+ & LGPLv2.1" 5LICENSE = "GPLv2+ & LGPLv2.1"
6LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ 6LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
9 file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" 8 file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95"
10 9
11DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" 10DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool"
@@ -32,11 +31,12 @@ EXTRA_OECONF = "\
32 ac_cv_header_valgrind_memcheck_h=no \ 31 ac_cv_header_valgrind_memcheck_h=no \
33" 32"
34 33
35PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 34PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
36 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 35 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 36 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
38 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 37 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
39PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" 38PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
39PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
40PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" 40PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
41PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" 41PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
42PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" 42PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb"
@@ -145,7 +145,6 @@ RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
145RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" 145RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
146 146
147FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" 147FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"
148FILES_pulseaudio-module-bluetooth-proximity += "${libexecdir}/pulse/proximity-helper"
149FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" 148FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
150 149
151RDEPENDS_pulseaudio-server += "\ 150RDEPENDS_pulseaudio-server += "\
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb
index 53dd49452d..8d8c421179 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb
@@ -3,9 +3,8 @@ require pulseaudio.inc
3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ 3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
4 file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ 4 file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \
5 file://volatiles.04_pulse" 5 file://volatiles.04_pulse"
6 6SRC_URI[md5sum] = "c43749838612f4860465e83ed62ca38e"
7SRC_URI[md5sum] = "591f211db2790a7e4d222f2dc6858db3" 7SRC_URI[sha256sum] = "99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939"
8SRC_URI[sha256sum] = "35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae"
9 8
10do_compile_prepend() { 9do_compile_prepend() {
11 mkdir -p ${S}/libltdl 10 mkdir -p ${S}/libltdl