diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2012-09-17 14:07:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 16:53:16 +0100 |
commit | bec76a381367484c5be8966225432d6860b0f7b8 (patch) | |
tree | a6f96610721cf905bc1ded1044884522a9367016 | |
parent | ead623b2a073488edd5870e7e7598349ea3143bd (diff) | |
download | poky-bec76a381367484c5be8966225432d6860b0f7b8.tar.gz |
pulseaudio: upgrade to 2.0
(From OE-Core rev: 961872787ac2c2b18d4589967e68a60ab3a4cc86)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb (renamed from meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb) | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index a2f0d9f14b..b952d6866c 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+ & LGPLv2.1" | |||
6 | LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ | 6 | LIC_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 \ | 8 | file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ |
9 | file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1" | 9 | file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" |
10 | DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ | 10 | DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ |
11 | ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" | 11 | ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" |
12 | # optional | 12 | # optional |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb index 02d4180531..7e57e5efeb 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require pulseaudio.inc | 1 | require pulseaudio.inc |
2 | 2 | ||
3 | PR = "r9" | 3 | PR = "r0" |
4 | 4 | ||
5 | DEPENDS += "libjson gdbm speex libxml-parser-perl-native" | 5 | DEPENDS += "libjson gdbm speex libxml-parser-perl-native" |
6 | 6 | ||
@@ -8,11 +8,10 @@ inherit gettext perlnative | |||
8 | 8 | ||
9 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ | 9 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ |
10 | file://volatiles.04_pulse \ | 10 | file://volatiles.04_pulse \ |
11 | file://pulseaudio_fix_for_x32.patch \ | ||
12 | " | 11 | " |
13 | 12 | ||
14 | SRC_URI[md5sum] = "17d21df798cee407b769c6355fae397a" | 13 | SRC_URI[md5sum] = "9bbde657c353fe675c3b693054175a8e" |
15 | SRC_URI[sha256sum] = "6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee" | 14 | SRC_URI[sha256sum] = "28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061" |
16 | 15 | ||
17 | do_compile_prepend() { | 16 | do_compile_prepend() { |
18 | cd ${S} | 17 | cd ${S} |