diff options
| author | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-07 10:00:18 +0000 |
|---|---|---|
| committer | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-07 10:00:18 +0000 |
| commit | 8beb70740dbd64d2138df8a07aafc24719cb50a6 (patch) | |
| tree | b9afae298a6bcb79696984da4422d5ef939a4031 /packages/pulseaudio | |
| parent | d2bbf4ace892d7f32933ca26f1f2b320fc0bcb99 (diff) | |
| parent | e25bfd9221d17ae8fe0efdc96ed9cd74de0e4a4d (diff) | |
merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'
Diffstat (limited to 'packages/pulseaudio')
| -rw-r--r-- | packages/pulseaudio/files/fix-dbus-without-hal.patch | 15 | ||||
| -rw-r--r-- | packages/pulseaudio/pulseaudio_0.9.8.bb | 9 |
2 files changed, 22 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 76bf6e8411..93c8ffb849 100644 --- a/packages/pulseaudio/pulseaudio_0.9.8.bb +++ b/packages/pulseaudio/pulseaudio_0.9.8.bb @@ -1,12 +1,17 @@ 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" |