summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
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 \
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
13DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \ 13DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \
14 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" 14 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4 sbc', '', d)}"
15 15
16SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ 16SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
17 file://gcc4-compile-fix.patch \ 17 file://gcc4-compile-fix.patch \
@@ -43,6 +43,8 @@ EXTRA_OECONF = "\
43 --without-fftw \ 43 --without-fftw \
44" 44"
45 45
46EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}"
47
46PARALLEL_MAKE = "" 48PARALLEL_MAKE = ""
47 49
48export TARGET_PFPU = "${TARGET_FPU}" 50export 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 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r15" 3PR = "r0"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6
7inherit gettext perlnative 7inherit gettext perlnative
8 8
9SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ 9SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
10 file://volatiles.04_pulse \ 10 file://volatiles.04_pulse"
11"
12 11
13SRC_URI[md5sum] = "33e85023259d530f0a763d5204e8bad9" 12SRC_URI[md5sum] = "47fd7eca8479c757822bee68a1feef25"
14SRC_URI[sha256sum] = "ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f" 13SRC_URI[sha256sum] = "c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d"
15 14
16do_compile_prepend() { 15do_compile_prepend() {
17 cd ${S} 16 cd ${S}