From d48a99dc8d92e65dc7618d61187138830d85a850 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 Nov 2011 10:18:12 +0100 Subject: pulseaudio: update to 1.1, delete 0.9.x Signed-off-by: Koen Kooi --- .../pulseaudio-0.9.23/autoconf_version.patch | 17 ----------- .../pulseaudio/pulseaudio-0.9.23/buildfix.patch | 17 ----------- .../pulseaudio-0.9.23/configure_silent_rules.patch | 33 --------------------- .../pulseaudio-0.9.23/fix_bluez_build.patch | 26 ----------------- .../pulseaudio-0.9.23/gcc4-compile-fix.patch | 22 -------------- .../pulseaudio/pulseaudio-0.9.23/tls_m4.patch | 34 ---------------------- .../pulseaudio-0.9.23/volatiles.04_pulse | 2 -- 7 files changed, 151 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/autoconf_version.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/buildfix.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/configure_silent_rules.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/gcc4-compile-fix.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/tls_m4.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/volatiles.04_pulse (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23') 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 86e3972e4..000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/autoconf_version.patch +++ /dev/null @@ -1,17 +0,0 @@ -Derived from OE by Dongxiao Xu - -Upstream-Status: Inappropriate [configuration] - -Index: pulseaudio-0.9.15/configure.ac -=================================================================== ---- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 -+++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100 -@@ -20,7 +20,7 @@ - # along with PulseAudio; if not, write to the Free Software Foundation, - # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - --AC_PREREQ(2.63) -+AC_PREREQ(2.61) - - m4_define(pa_major, [0]) - 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 99ceff8a9..000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/buildfix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Derived from OE by Dongxiao Xu - -Upstream-Status: Pending - -Index: pulseaudio-0.9.11/src/pulsecore/atomic.h -=================================================================== ---- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h -+++ pulseaudio-0.9.11/src/pulsecore/atomic.h -@@ -40,6 +40,8 @@ - #error "Please include config.h before including this file!" - #endif - -+#include "macro.h" -+ - #ifdef HAVE_ATOMIC_BUILTINS - - /* __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 d4a247a88..000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/configure_silent_rules.patch +++ /dev/null @@ -1,33 +0,0 @@ -Derived from OE by Dongxiao Xu - -Upstream-Status: Inappropriate [configuration] - -Index: pulseaudio-0.9.19/configure.ac -=================================================================== ---- pulseaudio-0.9.19.orig/configure.ac 2009-10-31 11:40:00.000000000 +0000 -+++ pulseaudio-0.9.19/configure.ac 2009-10-31 11:50:35.000000000 +0000 -@@ -27,12 +27,13 @@ - AC_CONFIG_SRCDIR([src/daemon/main.c]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) -+AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax]) - - m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) - m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`) - m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`) - -+ - AC_SUBST(PA_MAJOR, pa_major) - AC_SUBST(PA_MINOR, pa_minor) - AC_SUBST(PA_MICRO, pa_micro) -@@ -80,7 +81,8 @@ - ;; - esac - --AM_SILENT_RULES([yes]) -+# only use if available -+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - #### Checks for programs. #### - 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 fbb22d77e..000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/fix_bluez_build.patch +++ /dev/null @@ -1,26 +0,0 @@ -using uClibc $(INTLLIBS) is not empty but set to -lintl -this means that AM_LIBADD wont be empty as well and hence -a missing space which otherwise works starts to show up as error - -| make[4]: *** No rule to make target `-lintl', needed by `libbluetooth-ipc.la'. Stop. -| 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' -| make[3]: *** [all-recursive] Error 1 - -We add missing space - -Signed-off-by: Khem Raj - -Upstream-Status: Pending -Index: pulseaudio-0.9.23/src/Makefile.am -=================================================================== ---- pulseaudio-0.9.23.orig/src/Makefile.am 2011-06-23 13:18:54.000000000 -0700 -+++ pulseaudio-0.9.23/src/Makefile.am 2011-11-20 09:04:00.986917207 -0800 -@@ -1701,7 +1701,7 @@ - - libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h - libbluetooth_ipc_la_LDFLAGS = -avoid-version --libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la -+libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la - libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS) - BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h - 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 f8b07ea28..000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/gcc4-compile-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -| fix for more strict syntax compliance in gcc4.x -| pulsecore/core-util.c: In function 'pa_raise_priority': -| pulsecore/core-util.c:547: error: label at end of compound statement -| Signed off: mickey@openmoko.org -| -Derived from OE by Dongxiao Xu - -Upstream-Status: Pending - -Index: pulseaudio-0.9.6/src/pulsecore/core-util.c -=================================================================== ---- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c -+++ pulseaudio-0.9.6/src/pulsecore/core-util.c -@@ -535,7 +535,7 @@ void pa_raise_priority(void) { - pa_log_info("Successfully gained high priority class."); - #endif - --fail: -+fail:; - - #if defined(HAVE_SYS_CAPABILITY_H) - 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 bae0a259c..000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/tls_m4.patch +++ /dev/null @@ -1,34 +0,0 @@ -Derived from OE by Dongxiao Xu - -Upstream-Status: Inappropriate [configuration] - -Index: pulseaudio-0.9.15/m4/tls.m4 -=================================================================== ---- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200 -+++ pulseaudio-0.9.15/m4/tls.m4 2009-07-10 09:55:25.266365511 +0200 -@@ -1,12 +1,19 @@ - AC_DEFUN([CC_CHECK_TLS], [ - AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage], - cc_cv_tls___thread, -- [AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM( -- [[static __thread int a = 6;]], -- [[a = 5;]]), -- [cc_cv_tls___thread=yes], -- [cc_cv_tls___thread=no]) -+ [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], -+ [chktls_save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS" -+ chktls_save_CFLAGS="$CFLAGS" -+ CFLAGS="-fPIC $CFLAGS" -+ dnl If -shared works, test if TLS works in a shared library. -+ AC_LINK_IFELSE([int f() { return 0; }], -+ AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], -+ [cc_cv_tls___thread=yes], -+ [cc_cv_tls___thread=no]), -+ [cc_cv_tls___thread=yes]) -+ CFLAGS="$chktls_save_CFLAGS" -+ LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no]) - ]) - - 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 5b1998032..000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/volatiles.04_pulse +++ /dev/null @@ -1,2 +0,0 @@ -# -d pulse pulse 0755 /var/run/pulse none -- cgit v1.2.3