summaryrefslogtreecommitdiff
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
committerSaul Wold <sgw@linux.intel.com>2011-11-29 00:20:06 -0800
commitd48a99dc8d92e65dc7618d61187138830d85a850 (patch)
treeeaaddbe576c2b9cc5a3d21c4eb3b5161e5d58f6d /meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22
parent039e8d1f3235acae4162afad84fee6b8b3aba24e (diff)
downloadopenembedded-core-d48a99dc8d92e65dc7618d61187138830d85a850.tar.gz
openembedded-core-d48a99dc8d92e65dc7618d61187138830d85a850.tar.bz2
openembedded-core-d48a99dc8d92e65dc7618d61187138830d85a850.tar.xz
openembedded-core-d48a99dc8d92e65dc7618d61187138830d85a850.zip
pulseaudio: update to 1.1, delete 0.9.x
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
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 4ce5a48a0..000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: pulseaudio-0.9.21/src/pulsecore/svolume_arm.c
-===================================================================
---- pulseaudio-0.9.21.orig/src/pulsecore/svolume_arm.c
-+++ pulseaudio-0.9.21/src/pulsecore/svolume_arm.c
-@@ -37,6 +37,14 @@
-
- #if defined (__arm__)
-
-+/*
-+ the code below uses armv6 instructions; we can safely ifdef this away as the code is only
-+ called if the arm architecture is v6 or higher
-+*/
-+#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \
-+ && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \
-+ && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__))
-+
- #define MOD_INC() \
- " subs r0, r6, %2 \n\t" \
- " addcs r0, %1 \n\t" \
-@@ -179,11 +187,15 @@ static void run_test (void) {
- }
- #endif
-
-+#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */
- #endif /* defined (__arm__) */
-
-
- void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
- #if defined (__arm__)
-+#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \
-+ && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \
-+ && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__))
- pa_log_info("Initialising ARM optimized functions.");
-
- #ifdef RUN_TEST
-@@ -191,5 +203,6 @@ void pa_volume_func_init_arm (pa_cpu_arm
- #endif
-
- pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm);
-+#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */
- #endif /* defined (__arm__) */
- }
-Index: pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h
-===================================================================
---- pulseaudio-0.9.21.orig/src/modules/bluetooth/sbc_math.h
-+++ pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h
-@@ -47,7 +47,9 @@ typedef int32_t sbc_fixed_t;
-
- #define SBC_FIXED_0(val) { val = 0; }
- #define MUL(a, b) ((a) * (b))
--#ifdef __arm__
-+#if (defined(__arm__) && !defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \
-+ && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \
-+ && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__))
- #define MULA(a, b, res) ({ \
- int tmp = res; \
- __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 86e3972e4..000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
-
-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.22/buildfix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch
deleted file mode 100644
index 99ceff8a9..000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
-
-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.22/configure_silent_rules.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch
deleted file mode 100644
index d4a247a88..000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
-
-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.22/gcc4-compile-fix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch
deleted file mode 100644
index f8b07ea28..000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/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 <dongxiao.xu@intel.com>
-
-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.22/tls_m4.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch
deleted file mode 100644
index bae0a259c..000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
-
-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.22/volatiles.04_pulse b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse
deleted file mode 100644
index 5b1998032..000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse
+++ /dev/null
@@ -1,2 +0,0 @@
-# <type> <owner> <group> <mode> <path> <linksource>
-d pulse pulse 0755 /var/run/pulse none