From e04afd89be7bbe6f2a71c3efc43abc08f3dd7a91 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 18 Feb 2013 14:50:30 +0200 Subject: pulseaudio: upgrade to 3.0 ARM Neon instruction set compilation error fixed. Build system disables Neon optimisations if ARM target does not support it. BT support dependent on bluez and sbc support. sbc package added as a dependency. (From OE-Core rev: 4e7b91b5a2613b957b08aefbee1aac28fdd19598) Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 +++- .../recipes-multimedia/pulseaudio/pulseaudio_2.1.bb | 21 --------------------- .../recipes-multimedia/pulseaudio/pulseaudio_3.0.bb | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_3.0.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 81573e3100..9929f1baf4 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -11,7 +11,7 @@ DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" # optional DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" + ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4 sbc', '', d)}" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ file://gcc4-compile-fix.patch \ @@ -43,6 +43,8 @@ EXTRA_OECONF = "\ --without-fftw \ " +EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" + PARALLEL_MAKE = "" export TARGET_PFPU = "${TARGET_FPU}" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb deleted file mode 100644 index a5763680f9..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -require pulseaudio.inc - -PR = "r15" - -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] = "33e85023259d530f0a763d5204e8bad9" -SRC_URI[sha256sum] = "ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f" - -do_compile_prepend() { - cd ${S} - mkdir -p ${S}/libltdl - cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl -} - diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_3.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_3.0.bb new file mode 100644 index 0000000000..71c3c05640 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_3.0.bb @@ -0,0 +1,20 @@ +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] = "47fd7eca8479c757822bee68a1feef25" +SRC_URI[sha256sum] = "c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d" + +do_compile_prepend() { + cd ${S} + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} + -- cgit v1.2.3-54-g00ecf