summaryrefslogtreecommitdiff
path: root/packages/pulseaudio
diff options
context:
space:
mode:
Diffstat (limited to 'packages/pulseaudio')
-rw-r--r--packages/pulseaudio/files/fix-dbus-without-hal.patch15
-rw-r--r--packages/pulseaudio/pulseaudio_0.9.8.bb7
2 files changed, 20 insertions, 2 deletions
diff --git a/packages/pulseaudio/files/fix-dbus-without-hal.patch b/packages/pulseaudio/files/fix-dbus-without-hal.patch
new file mode 100644
index 0000000000..f8ac5674a6
--- /dev/null
+++ b/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/packages/pulseaudio/pulseaudio_0.9.8.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb
index 0677fc8d59..93c8ffb849 100644
--- a/packages/pulseaudio/pulseaudio_0.9.8.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.8.bb
@@ -3,12 +3,15 @@ require pulse.inc
DEPENDS += "dbus"
# this is not correct (see below)
-SRC_URI += "file://disable-using-glibc-tls.patch;patch=1"
+SRC_URI += "\
+ file://disable-using-glibc-tls.patch;patch=1 \
+ file://fix-dbus-without-hal.patch;patch=1 \
+"
PR = "r0"
# problems w/ pulseaudio 0.9.8 atm:
-# 1.) needs libtool >= 1.5.24 (yes, any older version will NOT work)
+# 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)
DEFAULT_PREFERENCE = "-1"