summaryrefslogtreecommitdiff
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-02-18 14:50:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 05:52:27 -0800
commit4e7b91b5a2613b957b08aefbee1aac28fdd19598 (patch)
tree850c93b2a6e3e8f930eb347b1208a7fd20c6d92c /meta/recipes-multimedia
parent52bc2abf77aeb0756df758ff2bdfadef170e4558 (diff)
downloadopenembedded-core-4e7b91b5a2613b957b08aefbee1aac28fdd19598.tar.gz
openembedded-core-4e7b91b5a2613b957b08aefbee1aac28fdd19598.tar.bz2
openembedded-core-4e7b91b5a2613b957b08aefbee1aac28fdd19598.zip
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. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc4
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_3.0.bb (renamed from meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb)9
2 files changed, 7 insertions, 6 deletions
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_3.0.bb
index a5763680f9..71c3c05640 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_3.0.bb
@@ -1,17 +1,16 @@
require pulseaudio.inc
-PR = "r15"
+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 \
-"
+ file://volatiles.04_pulse"
-SRC_URI[md5sum] = "33e85023259d530f0a763d5204e8bad9"
-SRC_URI[sha256sum] = "ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f"
+SRC_URI[md5sum] = "47fd7eca8479c757822bee68a1feef25"
+SRC_URI[sha256sum] = "c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d"
do_compile_prepend() {
cd ${S}