diff options
Diffstat (limited to 'meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10')
5 files changed, 123 insertions, 0 deletions
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff new file mode 100644 index 0000000000..666ed34ad3 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2113.diff | |||
@@ -0,0 +1,19 @@ | |||
1 | from upstream svn r2113 | ||
2 | |||
3 | Index: configure.ac | ||
4 | =================================================================== | ||
5 | --- configure.ac (wersja 2112) | ||
6 | +++ configure.ac (wersja 2113) | ||
7 | @@ -172,6 +172,12 @@ | ||
8 | AC_SUBST(LIBLTDL) | ||
9 | AC_CONFIG_SUBDIRS(libltdl) | ||
10 | |||
11 | +old_LIBS=$LIBS | ||
12 | +LIBS="$LIBS $LIBLTDL" | ||
13 | +AC_CHECK_FUNCS([lt_dlmutex_register]) | ||
14 | +LIBS=$old_LIBS | ||
15 | +AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) | ||
16 | + | ||
17 | if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then | ||
18 | AC_MSG_ERROR([[ | ||
19 | |||
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff new file mode 100644 index 0000000000..cbd82eeb84 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/2114.diff | |||
@@ -0,0 +1,15 @@ | |||
1 | from upstream svn r2114 | ||
2 | |||
3 | Index: configure.ac | ||
4 | =================================================================== | ||
5 | --- configure.ac (wersja 2113) | ||
6 | +++ configure.ac (wersja 2114) | ||
7 | @@ -176,7 +176,7 @@ | ||
8 | LIBS="$LIBS $LIBLTDL" | ||
9 | AC_CHECK_FUNCS([lt_dlmutex_register]) | ||
10 | LIBS=$old_LIBS | ||
11 | -AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) | ||
12 | +AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) | ||
13 | |||
14 | if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then | ||
15 | AC_MSG_ERROR([[ | ||
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch new file mode 100644 index 0000000000..4234af5f53 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | upstream: http://pulseaudio.org/ticket/287 | ||
2 | |||
3 | Index: pulseaudio-0.9.10/src/Makefile.am | ||
4 | =================================================================== | ||
5 | --- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200 | ||
6 | +++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200 | ||
7 | @@ -605,7 +605,7 @@ | ||
8 | |||
9 | libpulsedsp_la_SOURCES = utils/padsp.c | ||
10 | libpulsedsp_la_CFLAGS = $(AM_CFLAGS) | ||
11 | -libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la | ||
12 | +libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la | ||
13 | libpulsedsp_la_LDFLAGS = -avoid-version | ||
14 | |||
15 | ################################### | ||
16 | @@ -888,7 +888,7 @@ | ||
17 | |||
18 | libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h | ||
19 | libpstream_util_la_LDFLAGS = -avoid-version | ||
20 | -libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la | ||
21 | +libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la | ||
22 | |||
23 | libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h | ||
24 | libpdispatch_la_LDFLAGS = -avoid-version | ||
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch new file mode 100644 index 0000000000..9e9e5f55d3 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4 | ||
2 | |||
3 | --- | ||
4 | configure.ac | 26 +++++++++++++++++++------- | ||
5 | 1 file changed, 19 insertions(+), 7 deletions(-) | ||
6 | |||
7 | --- pulseaudio-0.9.10.orig/configure.ac | ||
8 | +++ pulseaudio-0.9.10/configure.ac | ||
9 | @@ -242,20 +242,32 @@ if test $ret -eq 0 ; then | ||
10 | else | ||
11 | AC_MSG_RESULT([no]) | ||
12 | fi | ||
13 | |||
14 | #### libtool stuff #### | ||
15 | - | ||
16 | -AC_LTDL_ENABLE_INSTALL | ||
17 | -AC_LIBLTDL_INSTALLABLE | ||
18 | -AC_LIBTOOL_DLOPEN | ||
19 | -AC_LIBTOOL_WIN32_DLL | ||
20 | +LT_PREREQ([2.2]) | ||
21 | +LT_INIT([dlopen win32-dll]) | ||
22 | AC_PROG_LIBTOOL | ||
23 | -AC_SUBST(LTDLINCL) | ||
24 | -AC_SUBST(LIBLTDL) | ||
25 | +#AC_SUBST(LTDLINCL) | ||
26 | +#AC_SUBST(LIBLTDL) | ||
27 | AC_CONFIG_SUBDIRS(libltdl) | ||
28 | |||
29 | +AC_ARG_WITH(libltdl-libs, | ||
30 | + [ --with-libltdl-libs=DIR path to libltdl libs], libltdl_libs_prefix=$withval) | ||
31 | +if test x$libltdl_libs_prefix != x; then | ||
32 | + LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl" | ||
33 | +fi | ||
34 | +AC_SUBST(LIBLTDL) | ||
35 | + | ||
36 | +AC_ARG_WITH(libltdl-includes, | ||
37 | + [ --with-libltdl-includes=DIR path to libltdl includes], libltdl_prefix=$withval) | ||
38 | +if test x$libltdl_prefix != x; then | ||
39 | + LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so" | ||
40 | +fi | ||
41 | +AC_SUBST(LTDLINCL) | ||
42 | + | ||
43 | + | ||
44 | old_LIBS=$LIBS | ||
45 | LIBS="$LIBS $LIBLTDL" | ||
46 | AC_CHECK_FUNCS([lt_dlmutex_register]) | ||
47 | LIBS=$old_LIBS | ||
48 | AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) | ||
diff --git a/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch new file mode 100644 index 0000000000..74ea6ac060 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | upstream: http://pulseaudio.org/changeset/2213 | ||
2 | |||
3 | Index: pulseaudio-0.9.10/src/daemon/caps.c | ||
4 | =================================================================== | ||
5 | --- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200 | ||
6 | +++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200 | ||
7 | @@ -131,9 +131,8 @@ | ||
8 | return 0; | ||
9 | } | ||
10 | |||
11 | -int pa_drop_caps(void) { | ||
12 | +void pa_drop_caps(void) { | ||
13 | pa_drop_root(); | ||
14 | - return 0; | ||
15 | } | ||
16 | |||
17 | #endif | ||