diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-06 13:27:07 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-07 13:45:32 +0100 |
commit | 2c79c9eb7ef8ef0aef8c3096c3c4387e28e56ea2 (patch) | |
tree | a0da0ced42738f92640a40232170e720960c1108 | |
parent | 760eace4a53dcc18a74bc6759535fe6cd108cb1f (diff) | |
download | poky-2c79c9eb7ef8ef0aef8c3096c3c4387e28e56ea2.tar.gz |
pulseaudio: add 0.9.23
Older version have been retained to allow more testing of this release
(From OE-Core rev: f1fc6d084b079dea21ff1a30b815496452042490)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8 files changed, 151 insertions, 1 deletions
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 new file mode 100644 index 0000000000..86e3972e4c --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/autoconf_version.patch | |||
@@ -0,0 +1,17 @@ | |||
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 new file mode 100644 index 0000000000..99ceff8a94 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/buildfix.patch | |||
@@ -0,0 +1,17 @@ | |||
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 new file mode 100644 index 0000000000..d4a247a889 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/configure_silent_rules.patch | |||
@@ -0,0 +1,33 @@ | |||
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/gcc4-compile-fix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/gcc4-compile-fix.patch new file mode 100644 index 0000000000..f8b07ea28b --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/gcc4-compile-fix.patch | |||
@@ -0,0 +1,22 @@ | |||
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 new file mode 100644 index 0000000000..bae0a259ce --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/tls_m4.patch | |||
@@ -0,0 +1,34 @@ | |||
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 new file mode 100644 index 0000000000..5b1998032b --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/volatiles.04_pulse | |||
@@ -0,0 +1,2 @@ | |||
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 ab7e8677b9..12e6ef30ca 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -65,7 +65,7 @@ FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" | |||
65 | 65 | ||
66 | FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ | 66 | FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ |
67 | ${libdir}/pulse-${PV}/modules/.debug" | 67 | ${libdir}/pulse-${PV}/modules/.debug" |
68 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la" | 68 | FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" |
69 | FILES_${PN}-conf = "${sysconfdir}" | 69 | FILES_${PN}-conf = "${sysconfdir}" |
70 | FILES_${PN}-bin = "${bindir}/* \ | 70 | FILES_${PN}-bin = "${bindir}/* \ |
71 | ${sysconfdir}/default/volatiles/volatiles.04_pulse" | 71 | ${sysconfdir}/default/volatiles/volatiles.04_pulse" |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb new file mode 100644 index 0000000000..4bdc4edf06 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | require pulseaudio.inc | ||
2 | |||
3 | PR = "r0" | ||
4 | |||
5 | DEPENDS += "gdbm speex" | ||
6 | |||
7 | inherit gettext | ||
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 | " | ||
16 | |||
17 | SRC_URI[md5sum] = "7391205a337d1e04a9ff38025f684034" | ||
18 | SRC_URI[sha256sum] = "af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e" | ||
19 | |||
20 | do_compile_prepend() { | ||
21 | cd ${S} | ||
22 | mkdir -p ${S}/libltdl | ||
23 | cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl | ||
24 | } | ||
25 | |||