diff options
| -rw-r--r-- | packages/pulseaudio/files/fix-shm.patch | 20 | ||||
| -rw-r--r-- | packages/pulseaudio/pulseaudio_0.9.9.bb | 4 | ||||
| -rw-r--r-- | packages/python/python-dbus_0.82.4.bb | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/packages/pulseaudio/files/fix-shm.patch b/packages/pulseaudio/files/fix-shm.patch new file mode 100644 index 0000000000..3bf61d0d34 --- /dev/null +++ b/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; diff --git a/packages/pulseaudio/pulseaudio_0.9.9.bb b/packages/pulseaudio/pulseaudio_0.9.9.bb index 7e63b61eb3..f38595e5dd 100644 --- a/packages/pulseaudio/pulseaudio_0.9.9.bb +++ b/packages/pulseaudio/pulseaudio_0.9.9.bb @@ -1,15 +1,15 @@ require pulse.inc DEPENDS += "dbus" +PR = "r4" # this is not correct (see below) SRC_URI += "\ file://disable-using-glibc-tls.patch;patch=1 \ file://fix-dbus-without-hal.patch;patch=1 \ + file://fix-shm.patch;patch=1 \ " -PR = "r3" - # 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) diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb index 8e80882a30..08cdbf7f44 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.82.4.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" RDEPENDS = "python-threading python-io python-stringold python-logging" -PR = "ml2" +PR = "ml3" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" -inherit distutils-base autotools +inherit distutils-base autotools pkgconfig export BUILD_SYS := "${BUILD_SYS}" export HOST_SYS := "${HOST_SYS}" |