diff options
19 files changed, 20 insertions, 388 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 90ff005089..a86bc0ce10 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Default preferred versions | 2 | # Default preferred versions |
| 3 | # | 3 | # |
| 4 | PREFERRED_VERSION_pulseaudio ?= "0.9.23" | ||
| 5 | 4 | ||
| 6 | # Force the python versions in one place | 5 | # Force the python versions in one place |
| 7 | PYTHON_BASEVERSION ?= "2.7" | 6 | PYTHON_BASEVERSION ?= "2.7" |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch deleted file mode 100644 index 4ce5a48a07..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [embedded specific] | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.21/src/pulsecore/svolume_arm.c | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.21.orig/src/pulsecore/svolume_arm.c | ||
| 8 | +++ pulseaudio-0.9.21/src/pulsecore/svolume_arm.c | ||
| 9 | @@ -37,6 +37,14 @@ | ||
| 10 | |||
| 11 | #if defined (__arm__) | ||
| 12 | |||
| 13 | +/* | ||
| 14 | + the code below uses armv6 instructions; we can safely ifdef this away as the code is only | ||
| 15 | + called if the arm architecture is v6 or higher | ||
| 16 | +*/ | ||
| 17 | +#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
| 18 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
| 19 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
| 20 | + | ||
| 21 | #define MOD_INC() \ | ||
| 22 | " subs r0, r6, %2 \n\t" \ | ||
| 23 | " addcs r0, %1 \n\t" \ | ||
| 24 | @@ -179,11 +187,15 @@ static void run_test (void) { | ||
| 25 | } | ||
| 26 | #endif | ||
| 27 | |||
| 28 | +#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */ | ||
| 29 | #endif /* defined (__arm__) */ | ||
| 30 | |||
| 31 | |||
| 32 | void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) { | ||
| 33 | #if defined (__arm__) | ||
| 34 | +#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
| 35 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
| 36 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
| 37 | pa_log_info("Initialising ARM optimized functions."); | ||
| 38 | |||
| 39 | #ifdef RUN_TEST | ||
| 40 | @@ -191,5 +203,6 @@ void pa_volume_func_init_arm (pa_cpu_arm | ||
| 41 | #endif | ||
| 42 | |||
| 43 | pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm); | ||
| 44 | +#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */ | ||
| 45 | #endif /* defined (__arm__) */ | ||
| 46 | } | ||
| 47 | Index: pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h | ||
| 48 | =================================================================== | ||
| 49 | --- pulseaudio-0.9.21.orig/src/modules/bluetooth/sbc_math.h | ||
| 50 | +++ pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h | ||
| 51 | @@ -47,7 +47,9 @@ typedef int32_t sbc_fixed_t; | ||
| 52 | |||
| 53 | #define SBC_FIXED_0(val) { val = 0; } | ||
| 54 | #define MUL(a, b) ((a) * (b)) | ||
| 55 | -#ifdef __arm__ | ||
| 56 | +#if (defined(__arm__) && !defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
| 57 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
| 58 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
| 59 | #define MULA(a, b, res) ({ \ | ||
| 60 | int tmp = res; \ | ||
| 61 | __asm__( \ | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch deleted file mode 100644 index 86e3972e4c..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.15/configure.ac | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 | ||
| 8 | +++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100 | ||
| 9 | @@ -20,7 +20,7 @@ | ||
| 10 | # along with PulseAudio; if not, write to the Free Software Foundation, | ||
| 11 | # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | ||
| 12 | |||
| 13 | -AC_PREREQ(2.63) | ||
| 14 | +AC_PREREQ(2.61) | ||
| 15 | |||
| 16 | m4_define(pa_major, [0]) | ||
| 17 | m4_define(pa_minor, [9]) | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch deleted file mode 100644 index 99ceff8a94..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.11/src/pulsecore/atomic.h | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h | ||
| 8 | +++ pulseaudio-0.9.11/src/pulsecore/atomic.h | ||
| 9 | @@ -40,6 +40,8 @@ | ||
| 10 | #error "Please include config.h before including this file!" | ||
| 11 | #endif | ||
| 12 | |||
| 13 | +#include "macro.h" | ||
| 14 | + | ||
| 15 | #ifdef HAVE_ATOMIC_BUILTINS | ||
| 16 | |||
| 17 | /* __sync based implementation */ | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch deleted file mode 100644 index d4a247a889..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.19/configure.ac | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.19.orig/configure.ac 2009-10-31 11:40:00.000000000 +0000 | ||
| 8 | +++ pulseaudio-0.9.19/configure.ac 2009-10-31 11:50:35.000000000 +0000 | ||
| 9 | @@ -27,12 +27,13 @@ | ||
| 10 | AC_CONFIG_SRCDIR([src/daemon/main.c]) | ||
| 11 | AC_CONFIG_MACRO_DIR([m4]) | ||
| 12 | AC_CONFIG_HEADERS([config.h]) | ||
| 13 | -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) | ||
| 14 | +AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax]) | ||
| 15 | |||
| 16 | m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) | ||
| 17 | m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`) | ||
| 18 | m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`) | ||
| 19 | |||
| 20 | + | ||
| 21 | AC_SUBST(PA_MAJOR, pa_major) | ||
| 22 | AC_SUBST(PA_MINOR, pa_minor) | ||
| 23 | AC_SUBST(PA_MICRO, pa_micro) | ||
| 24 | @@ -80,7 +81,8 @@ | ||
| 25 | ;; | ||
| 26 | esac | ||
| 27 | |||
| 28 | -AM_SILENT_RULES([yes]) | ||
| 29 | +# only use if available | ||
| 30 | +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
| 31 | |||
| 32 | #### Checks for programs. #### | ||
| 33 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch deleted file mode 100644 index f8b07ea28b..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | | fix for more strict syntax compliance in gcc4.x | ||
| 2 | | pulsecore/core-util.c: In function 'pa_raise_priority': | ||
| 3 | | pulsecore/core-util.c:547: error: label at end of compound statement | ||
| 4 | | Signed off: mickey@openmoko.org | ||
| 5 | | | ||
| 6 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | Index: pulseaudio-0.9.6/src/pulsecore/core-util.c | ||
| 11 | =================================================================== | ||
| 12 | --- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c | ||
| 13 | +++ pulseaudio-0.9.6/src/pulsecore/core-util.c | ||
| 14 | @@ -535,7 +535,7 @@ void pa_raise_priority(void) { | ||
| 15 | pa_log_info("Successfully gained high priority class."); | ||
| 16 | #endif | ||
| 17 | |||
| 18 | -fail: | ||
| 19 | +fail:; | ||
| 20 | |||
| 21 | #if defined(HAVE_SYS_CAPABILITY_H) | ||
| 22 | if (caps) { | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch deleted file mode 100644 index bae0a259ce..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.15/m4/tls.m4 | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200 | ||
| 8 | +++ pulseaudio-0.9.15/m4/tls.m4 2009-07-10 09:55:25.266365511 +0200 | ||
| 9 | @@ -1,12 +1,19 @@ | ||
| 10 | AC_DEFUN([CC_CHECK_TLS], [ | ||
| 11 | AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage], | ||
| 12 | cc_cv_tls___thread, | ||
| 13 | - [AC_COMPILE_IFELSE( | ||
| 14 | - AC_LANG_PROGRAM( | ||
| 15 | - [[static __thread int a = 6;]], | ||
| 16 | - [[a = 5;]]), | ||
| 17 | - [cc_cv_tls___thread=yes], | ||
| 18 | - [cc_cv_tls___thread=no]) | ||
| 19 | + [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], | ||
| 20 | + [chktls_save_LDFLAGS="$LDFLAGS" | ||
| 21 | + LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS" | ||
| 22 | + chktls_save_CFLAGS="$CFLAGS" | ||
| 23 | + CFLAGS="-fPIC $CFLAGS" | ||
| 24 | + dnl If -shared works, test if TLS works in a shared library. | ||
| 25 | + AC_LINK_IFELSE([int f() { return 0; }], | ||
| 26 | + AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], | ||
| 27 | + [cc_cv_tls___thread=yes], | ||
| 28 | + [cc_cv_tls___thread=no]), | ||
| 29 | + [cc_cv_tls___thread=yes]) | ||
| 30 | + CFLAGS="$chktls_save_CFLAGS" | ||
| 31 | + LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no]) | ||
| 32 | ]) | ||
| 33 | |||
| 34 | AS_IF([test "x$cc_cv_tls___thread" = "xyes"], | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/autoconf_version.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/autoconf_version.patch deleted file mode 100644 index 86e3972e4c..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/autoconf_version.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.15/configure.ac | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 | ||
| 8 | +++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100 | ||
| 9 | @@ -20,7 +20,7 @@ | ||
| 10 | # along with PulseAudio; if not, write to the Free Software Foundation, | ||
| 11 | # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | ||
| 12 | |||
| 13 | -AC_PREREQ(2.63) | ||
| 14 | +AC_PREREQ(2.61) | ||
| 15 | |||
| 16 | m4_define(pa_major, [0]) | ||
| 17 | m4_define(pa_minor, [9]) | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/buildfix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/buildfix.patch deleted file mode 100644 index 99ceff8a94..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/buildfix.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.11/src/pulsecore/atomic.h | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h | ||
| 8 | +++ pulseaudio-0.9.11/src/pulsecore/atomic.h | ||
| 9 | @@ -40,6 +40,8 @@ | ||
| 10 | #error "Please include config.h before including this file!" | ||
| 11 | #endif | ||
| 12 | |||
| 13 | +#include "macro.h" | ||
| 14 | + | ||
| 15 | #ifdef HAVE_ATOMIC_BUILTINS | ||
| 16 | |||
| 17 | /* __sync based implementation */ | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/configure_silent_rules.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/configure_silent_rules.patch deleted file mode 100644 index d4a247a889..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/configure_silent_rules.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.19/configure.ac | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.19.orig/configure.ac 2009-10-31 11:40:00.000000000 +0000 | ||
| 8 | +++ pulseaudio-0.9.19/configure.ac 2009-10-31 11:50:35.000000000 +0000 | ||
| 9 | @@ -27,12 +27,13 @@ | ||
| 10 | AC_CONFIG_SRCDIR([src/daemon/main.c]) | ||
| 11 | AC_CONFIG_MACRO_DIR([m4]) | ||
| 12 | AC_CONFIG_HEADERS([config.h]) | ||
| 13 | -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) | ||
| 14 | +AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax]) | ||
| 15 | |||
| 16 | m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) | ||
| 17 | m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`) | ||
| 18 | m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`) | ||
| 19 | |||
| 20 | + | ||
| 21 | AC_SUBST(PA_MAJOR, pa_major) | ||
| 22 | AC_SUBST(PA_MINOR, pa_minor) | ||
| 23 | AC_SUBST(PA_MICRO, pa_micro) | ||
| 24 | @@ -80,7 +81,8 @@ | ||
| 25 | ;; | ||
| 26 | esac | ||
| 27 | |||
| 28 | -AM_SILENT_RULES([yes]) | ||
| 29 | +# only use if available | ||
| 30 | +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
| 31 | |||
| 32 | #### Checks for programs. #### | ||
| 33 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch deleted file mode 100644 index fbb22d77e0..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | using uClibc $(INTLLIBS) is not empty but set to -lintl | ||
| 2 | this means that AM_LIBADD wont be empty as well and hence | ||
| 3 | a missing space which otherwise works starts to show up as error | ||
| 4 | |||
| 5 | | make[4]: *** No rule to make target `-lintl', needed by `libbluetooth-ipc.la'. Stop. | ||
| 6 | | make[4]: Leaving directory `/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/work/armv5te-oe-linux-uclibceabi/pulseaudio-0.9.23-r7/pulseaudio-0.9.23/src' | ||
| 7 | | make[3]: *** [all-recursive] Error 1 | ||
| 8 | |||
| 9 | We add missing space | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Index: pulseaudio-0.9.23/src/Makefile.am | ||
| 15 | =================================================================== | ||
| 16 | --- pulseaudio-0.9.23.orig/src/Makefile.am 2011-06-23 13:18:54.000000000 -0700 | ||
| 17 | +++ pulseaudio-0.9.23/src/Makefile.am 2011-11-20 09:04:00.986917207 -0800 | ||
| 18 | @@ -1701,7 +1701,7 @@ | ||
| 19 | |||
| 20 | libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h | ||
| 21 | libbluetooth_ipc_la_LDFLAGS = -avoid-version | ||
| 22 | -libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la | ||
| 23 | +libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la | ||
| 24 | libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS) | ||
| 25 | BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h | ||
| 26 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/gcc4-compile-fix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/gcc4-compile-fix.patch deleted file mode 100644 index f8b07ea28b..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/gcc4-compile-fix.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | | fix for more strict syntax compliance in gcc4.x | ||
| 2 | | pulsecore/core-util.c: In function 'pa_raise_priority': | ||
| 3 | | pulsecore/core-util.c:547: error: label at end of compound statement | ||
| 4 | | Signed off: mickey@openmoko.org | ||
| 5 | | | ||
| 6 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | Index: pulseaudio-0.9.6/src/pulsecore/core-util.c | ||
| 11 | =================================================================== | ||
| 12 | --- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c | ||
| 13 | +++ pulseaudio-0.9.6/src/pulsecore/core-util.c | ||
| 14 | @@ -535,7 +535,7 @@ void pa_raise_priority(void) { | ||
| 15 | pa_log_info("Successfully gained high priority class."); | ||
| 16 | #endif | ||
| 17 | |||
| 18 | -fail: | ||
| 19 | +fail:; | ||
| 20 | |||
| 21 | #if defined(HAVE_SYS_CAPABILITY_H) | ||
| 22 | if (caps) { | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/tls_m4.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/tls_m4.patch deleted file mode 100644 index bae0a259ce..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/tls_m4.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | |||
| 5 | Index: pulseaudio-0.9.15/m4/tls.m4 | ||
| 6 | =================================================================== | ||
| 7 | --- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200 | ||
| 8 | +++ pulseaudio-0.9.15/m4/tls.m4 2009-07-10 09:55:25.266365511 +0200 | ||
| 9 | @@ -1,12 +1,19 @@ | ||
| 10 | AC_DEFUN([CC_CHECK_TLS], [ | ||
| 11 | AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage], | ||
| 12 | cc_cv_tls___thread, | ||
| 13 | - [AC_COMPILE_IFELSE( | ||
| 14 | - AC_LANG_PROGRAM( | ||
| 15 | - [[static __thread int a = 6;]], | ||
| 16 | - [[a = 5;]]), | ||
| 17 | - [cc_cv_tls___thread=yes], | ||
| 18 | - [cc_cv_tls___thread=no]) | ||
| 19 | + [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], | ||
| 20 | + [chktls_save_LDFLAGS="$LDFLAGS" | ||
| 21 | + LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS" | ||
| 22 | + chktls_save_CFLAGS="$CFLAGS" | ||
| 23 | + CFLAGS="-fPIC $CFLAGS" | ||
| 24 | + dnl If -shared works, test if TLS works in a shared library. | ||
| 25 | + AC_LINK_IFELSE([int f() { return 0; }], | ||
| 26 | + AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], | ||
| 27 | + [cc_cv_tls___thread=yes], | ||
| 28 | + [cc_cv_tls___thread=no]), | ||
| 29 | + [cc_cv_tls___thread=yes]) | ||
| 30 | + CFLAGS="$chktls_save_CFLAGS" | ||
| 31 | + LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no]) | ||
| 32 | ]) | ||
| 33 | |||
| 34 | AS_IF([test "x$cc_cv_tls___thread" = "xyes"], | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/volatiles.04_pulse b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/volatiles.04_pulse deleted file mode 100644 index 5b1998032b..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/volatiles.04_pulse +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | # <type> <owner> <group> <mode> <path> <linksource> | ||
| 2 | d pulse pulse 0755 /var/run/pulse none | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 747b650e7b..a94c398332 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
| @@ -68,7 +68,7 @@ FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" | |||
| 68 | 68 | ||
| 69 | FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ | 69 | FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ |
| 70 | ${libdir}/pulse-${PV}/modules/.debug" | 70 | ${libdir}/pulse-${PV}/modules/.debug" |
| 71 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" | 71 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" |
| 72 | FILES_${PN}-conf = "${sysconfdir}" | 72 | FILES_${PN}-conf = "${sysconfdir}" |
| 73 | FILES_${PN}-bin = "${bindir}/* \ | 73 | FILES_${PN}-bin = "${bindir}/* \ |
| 74 | ${sysconfdir}/default/volatiles/volatiles.04_pulse" | 74 | ${sysconfdir}/default/volatiles/volatiles.04_pulse" |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse b/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse index 5b1998032b..5b1998032b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb deleted file mode 100644 index 3067365cc2..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | require pulseaudio.inc | ||
| 2 | |||
| 3 | PR = "r7" | ||
| 4 | |||
| 5 | DEPENDS += "gdbm speex" | ||
| 6 | |||
| 7 | inherit gettext | ||
| 8 | |||
| 9 | SRC_URI += "\ | ||
| 10 | file://buildfix.patch \ | ||
| 11 | file://autoconf_version.patch \ | ||
| 12 | file://tls_m4.patch \ | ||
| 13 | file://configure_silent_rules.patch \ | ||
| 14 | file://armv4+v5asm.patch \ | ||
| 15 | " | ||
| 16 | |||
| 17 | do_compile_prepend() { | ||
| 18 | cd ${S} | ||
| 19 | mkdir -p ${S}/libltdl | ||
| 20 | cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl | ||
| 21 | } | ||
| 22 | |||
| 23 | SRC_URI[md5sum] = "ca85ab470669b05e100861654cf5eb3c" | ||
| 24 | SRC_URI[sha256sum] = "c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0" | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb deleted file mode 100644 index e712cabebd..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | require pulseaudio.inc | ||
| 2 | |||
| 3 | PR = "r8" | ||
| 4 | |||
| 5 | DEPENDS += "gdbm speex libxml-parser-perl-native" | ||
| 6 | |||
| 7 | inherit gettext perlnative | ||
| 8 | |||
| 9 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.gz \ | ||
| 10 | file://buildfix.patch \ | ||
| 11 | file://autoconf_version.patch \ | ||
| 12 | file://tls_m4.patch \ | ||
| 13 | file://configure_silent_rules.patch \ | ||
| 14 | file://volatiles.04_pulse \ | ||
| 15 | file://fix_bluez_build.patch \ | ||
| 16 | " | ||
| 17 | |||
| 18 | SRC_URI[md5sum] = "7391205a337d1e04a9ff38025f684034" | ||
| 19 | SRC_URI[sha256sum] = "af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e" | ||
| 20 | |||
| 21 | do_compile_prepend() { | ||
| 22 | cd ${S} | ||
| 23 | mkdir -p ${S}/libltdl | ||
| 24 | cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl | ||
| 25 | } | ||
| 26 | |||
| 27 | ARM_INSTRUCTION_SET = "arm" | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb new file mode 100644 index 0000000000..d97c9327a7 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | require pulseaudio.inc | ||
| 2 | |||
| 3 | DEPENDS += "libjson gdbm speex libxml-parser-perl-native" | ||
| 4 | |||
| 5 | inherit gettext perlnative | ||
| 6 | |||
| 7 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ | ||
| 8 | file://volatiles.04_pulse \ | ||
| 9 | " | ||
| 10 | |||
| 11 | SRC_URI[md5sum] = "17d21df798cee407b769c6355fae397a" | ||
| 12 | SRC_URI[sha256sum] = "6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee" | ||
| 13 | |||
| 14 | do_compile_prepend() { | ||
| 15 | cd ${S} | ||
| 16 | mkdir -p ${S}/libltdl | ||
| 17 | cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl | ||
| 18 | } | ||
| 19 | |||
