[oe-commits] org.oe.dev pulseaudio 0.9.8 needs patch for corner case when you build with dbus but without HAL

[mickeyl commit]

pulseaudio 0.9.8 needs patch for corner case when you build with dbus but without HAL

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: bf13c465f9f4c46132e74d7e9b93c2d1feb84ac6
ViewMTN: http://monotone.openembedded.org/revision/info/bf13c465f9f4c46132e74d7e9b93c2d1feb84ac6
Files:
1
packages/pulseaudio/files/fix-dbus-without-hal.patch
packages/pulseaudio/pulseaudio_0.9.8.bb
Diffs:

#
# mt diff -rdfdb2e5eba7e5ebd1c5651d18f692b8ed391ed20 -rbf13c465f9f4c46132e74d7e9b93c2d1feb84ac6
#
# 
# 
# add_file "packages/pulseaudio/files/fix-dbus-without-hal.patch"
#  content [e816cccb9c342074e7c44d20f642b8833d11d57f]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.8.bb"
#  from [55d6c45d34705f246fe616aca12e6126952c0e95]
#    to [0ce1c8812f67eceea08584e12ec2e17e8b225790]
# 
============================================================
--- packages/pulseaudio/files/fix-dbus-without-hal.patch	e816cccb9c342074e7c44d20f642b8833d11d57f
+++ packages/pulseaudio/files/fix-dbus-without-hal.patch	e816cccb9c342074e7c44d20f642b8833d11d57f
@@ -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
============================================================
--- packages/pulseaudio/pulseaudio_0.9.8.bb	55d6c45d34705f246fe616aca12e6126952c0e95
+++ packages/pulseaudio/pulseaudio_0.9.8.bb	0ce1c8812f67eceea08584e12ec2e17e8b225790
@@ -1,14 +1,17 @@ DEPENDS += "dbus"
 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"