diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-02-07 14:36:05 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-02-07 14:36:05 +0000 |
| commit | 24d1939f49e4e0d72d4caab27146424bee44eb49 (patch) | |
| tree | c265c220a8729bf6bc6ce117aa51b6380cd3d278 /packages/pulseaudio | |
| parent | 3489195f914c433ab0cc5a9e1f4b4e6911a39cb7 (diff) | |
| parent | 9d19825f572e93530dc6eae3f43d92d8b9f32e0f (diff) | |
merge of 'b281d50e8f5a095af5987accdb02c314cb86d1e0'
and 'dd027a8b3d308568f5c47f602615755d6bbb5d86'
Diffstat (limited to 'packages/pulseaudio')
| -rw-r--r-- | packages/pulseaudio/files/disable-using-glibc-tls.patch | 18 | ||||
| -rw-r--r-- | packages/pulseaudio/pulseaudio_0.9.9.bb | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/packages/pulseaudio/files/disable-using-glibc-tls.patch b/packages/pulseaudio/files/disable-using-glibc-tls.patch index 9646e2c2d0..31d147be7d 100644 --- a/packages/pulseaudio/files/disable-using-glibc-tls.patch +++ b/packages/pulseaudio/files/disable-using-glibc-tls.patch @@ -1,8 +1,8 @@ -Index: pulseaudio-0.9.7/configure.ac +Index: pulseaudio-0.9.9/configure.ac =================================================================== ---- pulseaudio-0.9.7.orig/configure.ac -+++ pulseaudio-0.9.7/configure.ac -@@ -124,8 +124,8 @@ +--- 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 @@ -13,3 +13,13 @@ Index: pulseaudio-0.9.7/configure.ac 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/packages/pulseaudio/pulseaudio_0.9.9.bb b/packages/pulseaudio/pulseaudio_0.9.9.bb index f52ca6e1c6..d1e5706809 100644 --- a/packages/pulseaudio/pulseaudio_0.9.9.bb +++ b/packages/pulseaudio/pulseaudio_0.9.9.bb @@ -8,11 +8,11 @@ SRC_URI += "\ file://fix-dbus-without-hal.patch;patch=1 \ " -PR = "r0" +PR = "r1" # problems w/ pulseaudio 0.9.9 atm: # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) # 2.) doesn't build w/ glibc TLS support (hence patched out) -# 3.) hangs, if used with gst-pulse 0.9.7 +# 3.) hangs, if used with gst-pulse 0.9.7, fails with hierarchical pthread stuff DEFAULT_PREFERENCE = "-1" |