diff options
| author |   Cristian Iorga <cristian.iorga@intel.com> | 2012-09-17 14:07:31 +0200 |
|---|---|---|
| committer |   Scott Garman <scott.a.garman@intel.com> | 2012-09-24 09:51:13 -0700 |
| commit | 961872787ac2c2b18d4589967e68a60ab3a4cc86 (patch) | |
| tree | b428b4ad3ac127e5ce8cc4c55cf3910613481e22 | |
| parent | ac3edffa2586064ff480b89e80b608f14e566fa7 (diff) | |
| download | openembedded-core-961872787ac2c2b18d4589967e68a60ab3a4cc86.tar.gz | |
pulseaudio: upgrade to 2.0
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" 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 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 @@ require pulseaudio.inc -PR = "r9" +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} |