diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-06-06 09:10:40 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-06-06 09:10:40 +0000 |
| commit | 65ff103fd8fed0b8980715cdbbe4723302f69beb (patch) | |
| tree | 740143a5017d3bb77c12e5cdb5bf064ce88ebc54 /meta-openmoko/packages/pulseaudio/files | |
| parent | b6f01d320574f806d83e6307abc21e531da3f3e3 (diff) | |
| download | openembedded-core-65ff103fd8fed0b8980715cdbbe4723302f69beb.tar.gz openembedded-core-65ff103fd8fed0b8980715cdbbe4723302f69beb.tar.bz2 openembedded-core-65ff103fd8fed0b8980715cdbbe4723302f69beb.zip | |
pulseaudio: add forgotten patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4597 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-openmoko/packages/pulseaudio/files')
3 files changed, 60 insertions, 0 deletions
diff --git a/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch b/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch new file mode 100644 index 0000000000..31d147be7d --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/files/disable-using-glibc-tls.patch @@ -0,0 +1,25 @@ +Index: pulseaudio-0.9.9/configure.ac +=================================================================== +--- pulseaudio-0.9.9.orig/configure.ac 2008-01-24 01:06:06.000000000 +0000 ++++ pulseaudio-0.9.9/configure.ac 2008-02-05 17:45:59.000000000 +0000 +@@ -139,8 +139,8 @@ + ret=$? + rm -f conftest.o conftest + if test $ret -eq 0 ; then +- AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().]) +- AC_MSG_RESULT([yes]) ++dnl AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().]) ++ AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([no]) + fi +@@ -325,8 +325,7 @@ + rm -f conftest.o conftest + + if test $ret -eq 0 ; then +- AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]) +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([no]) + fi diff --git a/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch b/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch new file mode 100644 index 0000000000..f8ac5674a6 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/files/fix-dbus-without-hal.patch @@ -0,0 +1,15 @@ +Index: pulseaudio-0.9.8/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.8.orig/src/Makefile.am ++++ pulseaudio-0.9.8/src/Makefile.am +@@ -1424,8 +1424,8 @@ + # HAL + libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h + libdbus_util_la_LDFLAGS = -avoid-version +-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la +-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) ++libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la ++libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS) + + module_hal_detect_la_SOURCES = modules/module-hal-detect.c + module_hal_detect_la_LDFLAGS = -module -avoid-version diff --git a/meta-openmoko/packages/pulseaudio/files/fix-shm.patch b/meta-openmoko/packages/pulseaudio/files/fix-shm.patch new file mode 100644 index 0000000000..3bf61d0d34 --- /dev/null +++ b/meta-openmoko/packages/pulseaudio/files/fix-shm.patch @@ -0,0 +1,20 @@ +# fixes building against uclibc +# fixed upstream, see http://www.pulseaudio.org/ticket/200 +Index: pulseaudio-0.9.9/src/pulsecore/shm.c +=================================================================== +--- pulseaudio-0.9.9/src/pulsecore/shm.c (revision 1971) ++++ pulseaudio-0.9.9/src/pulsecore/shm.c (revision 2110) +@@ -319,4 +319,5 @@ + int pa_shm_cleanup(void) { + ++#ifdef HAVE_SHM_OPEN + #ifdef SHM_PATH + DIR *d; +@@ -376,5 +377,6 @@ + + closedir(d); +-#endif ++#endif /* SHM_PATH */ ++#endif /* HAVE_SHM_OPEN */ + + return 0; |