diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-03-18 10:04:44 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-21 12:05:31 +0000 |
| commit | c53d3a4f1f2d42437dc2985fe109039c843aa4dc (patch) | |
| tree | cfe21bea28534a616cc9171f1e955240869eebb7 /meta | |
| parent | 109ae6c5c981610ab0d63d2c83dcd50b2e93276b (diff) | |
| download | openembedded-core-c53d3a4f1f2d42437dc2985fe109039c843aa4dc.tar.gz openembedded-core-c53d3a4f1f2d42437dc2985fe109039c843aa4dc.tar.bz2 openembedded-core-c53d3a4f1f2d42437dc2985fe109039c843aa4dc.zip | |
pulseaudio: Upgrade 4.0 -> 5.0
bluetooth-proximity has been removed in 5.0
pulseaudio now differentiates between bluez4 and bluez5
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 7 | ||||
| -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" 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" @@ -32,11 +31,12 @@ EXTRA_OECONF = "\ ac_cv_header_valgrind_memcheck_h=no \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" +PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" +PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" @@ -145,7 +145,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 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 SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ 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 |