From bec76a381367484c5be8966225432d6860b0f7b8 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 17 Sep 2012 14:07:31 +0200 Subject: pulseaudio: upgrade to 2.0 (From OE-Core rev: 961872787ac2c2b18d4589967e68a60ab3a4cc86) Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie Conflicts: meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- .../pulseaudio/pulseaudio_1.1.bb | 22 ---------------------- .../pulseaudio/pulseaudio_2.0.bb | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb 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_1.1.bb deleted file mode 100644 index 02d4180531..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -require pulseaudio.inc - -PR = "r9" - -DEPENDS += "libjson gdbm speex libxml-parser-perl-native" - -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" - -do_compile_prepend() { - cd ${S} - mkdir -p ${S}/libltdl - cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl -} - diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb new file mode 100644 index 0000000000..7e57e5efeb --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.0.bb @@ -0,0 +1,21 @@ +require pulseaudio.inc + +PR = "r0" + +DEPENDS += "libjson gdbm speex libxml-parser-perl-native" + +inherit gettext perlnative + +SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ + file://volatiles.04_pulse \ +" + +SRC_URI[md5sum] = "9bbde657c353fe675c3b693054175a8e" +SRC_URI[sha256sum] = "28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061" + +do_compile_prepend() { + cd ${S} + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} + -- cgit v1.2.3-54-g00ecf