summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-11-24 10:18:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 11:22:04 +0000
commit5369fb342251736e8b2ec14b3dd03cdf2c93379f (patch)
treedd87b926ac7e2ec32c644bd92e701fd98b667a6c /meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22
parent100b34089696d953101a48a4ae14017a535aaa60 (diff)
downloadpoky-5369fb342251736e8b2ec14b3dd03cdf2c93379f.tar.gz
pulseaudio: update to 1.1, delete 0.9.x
(From OE-Core rev: d48a99dc8d92e65dc7618d61187138830d85a850) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch61
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch17
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch17
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch33
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch22
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch34
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse2
7 files changed, 0 insertions, 186 deletions
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 @@
1Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
2
3Upstream-Status: Inappropriate [embedded specific]
4
5Index: 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 }
47Index: 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 @@
1Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
2
3Upstream-Status: Inappropriate [configuration]
4
5Index: 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 @@
1Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
2
3Upstream-Status: Pending
4
5Index: 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 @@
1Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
2
3Upstream-Status: Inappropriate [configuration]
4
5Index: 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|
6Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
7
8Upstream-Status: Pending
9
10Index: 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 @@
1Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
2
3Upstream-Status: Inappropriate [configuration]
4
5Index: 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.22/volatiles.04_pulse b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse
deleted file mode 100644
index 5b1998032b..0000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse
+++ /dev/null
@@ -1,2 +0,0 @@
1# <type> <owner> <group> <mode> <path> <linksource>
2d pulse pulse 0755 /var/run/pulse none