From: Oliver Ertl <oliver@ertl-net.net>
Date: Fri, 11 Apr 2008 11:30:26 +0000 (+0000)
Subject: [Packages] sound/pulseaudio: Update to 0.9.10, goes again further in the compilation... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=3f23b105cf74724e5dd21ab8ea995d78e4cc0b6d

[Packages] sound/pulseaudio: Update to 0.9.10, goes again further in the compilation process

SVN-Revision: 10788
---

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index 11fa1037f4..7051d6be6e 100644
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -1,20 +1,22 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pulseaudio
-PKG_VERSION:=0.9.9
+PKG_VERSION:=0.9.10
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/pulseaudio/
-PKG_MD5SUM:=8a6f7a9611bb194d94311764022b197
+PKG_MD5SUM:=9187ac1b302b9ab45f355242f453882e
+
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,10 +35,13 @@ CONFIGURE_ARGS += \
 	--with-access-group=root \
 	--without-x \
 	--enable-static-bins \
+	--enable-ltdl-install \
 	--disable-dbus \
 	--disable-hal \
 	--disable-gconf \
 	--disable-tcpwrap \
+
+CONFIGURE_VARS += \
 	PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 	LIBOIL_CFLAGS="-I$(STAGING_DIR)/usr/include/liboil-0.3/" \
 	LIBOIL_LIBS="-L$(STAGING_DIR)/usr/lib/" \
diff --git a/sound/pulseaudio/patches/001-atomic_ops_headers.patch b/sound/pulseaudio/patches/001-atomic_ops_headers.patch
index dc5d392f22..b017a3a8d1 100644
--- a/sound/pulseaudio/patches/001-atomic_ops_headers.patch
+++ b/sound/pulseaudio/patches/001-atomic_ops_headers.patch
@@ -1,14 +1,14 @@
-diff -urN pulseaudio-0.9.7/configure pulseaudio-0.9.7.new/configure
---- pulseaudio-0.9.7/configure  2007-10-30 17:02:51.000000000 +0100
-+++ pulseaudio-0.9.7.new/configure      2007-11-11 20:39:27.000000000 +0100
-@@ -29636,8 +29636,7 @@
+Index: pulseaudio-0.9.10/configure
+===================================================================
+--- pulseaudio-0.9.10.orig/configure	2008-04-11 13:28:12.000000000 +0200
++++ pulseaudio-0.9.10/configure	2008-04-11 13:28:12.000000000 +0200
+@@ -30281,8 +30281,7 @@
  else
-
- { { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
+ 
+    { { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
 -echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
 -   { (exit 1); exit 1; }; }
 +echo "$as_me: error: *** libatomic-ops headers not found" >&2;} }
-
+ 
  fi
-
-
+ 
diff --git a/sound/pulseaudio/patches/002-shm_unlink.patch b/sound/pulseaudio/patches/002-shm_unlink.patch
index edc6dc4995..cb608474eb 100644
--- a/sound/pulseaudio/patches/002-shm_unlink.patch
+++ b/sound/pulseaudio/patches/002-shm_unlink.patch
@@ -1,6 +1,16 @@
-diff -urN pulseaudio-0.9.7/src/pulsecore/shm.c pulseaudio-0.9.7.new/src/pulsecore/shm.c
---- pulseaudio-0.9.7/src/pulsecore/shm.c	2007-10-28 20:13:53.000000000 +0100
-+++ pulseaudio-0.9.7.new/src/pulsecore/shm.c	2007-12-09 19:25:03.000000000 +0100
+Index: pulseaudio-0.9.10/src/pulsecore/shm.c
+===================================================================
+--- pulseaudio-0.9.10.orig/src/pulsecore/shm.c	2008-04-11 13:28:12.000000000 +0200
++++ pulseaudio-0.9.10/src/pulsecore/shm.c	2008-04-11 13:28:13.000000000 +0200
+@@ -125,7 +125,7 @@
+         m->do_unlink = 0;
+ 
+     } else {
+-#ifdef HAVE_SHM_OPEN
++#ifdef HAVE_SHM_UNLINK
+         struct shm_marker *marker;
+ 
+         pa_random(&m->id, sizeof(m->id));
 @@ -167,7 +167,7 @@
  
  fail:
@@ -19,7 +29,25 @@ diff -urN pulseaudio-0.9.7/src/pulsecore/shm.c pulseaudio-0.9.7.new/src/pulsecor
          if (munmap(m->ptr, m->size) < 0)
              pa_log("munmap() failed: %s", pa_cstrerror(errno));
  
-@@ -370,8 +370,10 @@
+@@ -260,7 +260,7 @@
+ #endif
+ }
+ 
+-#ifdef HAVE_SHM_OPEN
++#ifdef HAVE_SHM_UNLINK
+ 
+ int pa_shm_attach_ro(pa_shm *m, unsigned id) {
+     char fn[32];
+@@ -318,7 +318,7 @@
+ 
+ int pa_shm_cleanup(void) {
+ 
+-#ifdef HAVE_SHM_OPEN
++#ifdef HAVE_SHM_UNLINK
+ #ifdef SHM_PATH
+     DIR *d;
+     struct dirent *de;
+@@ -371,8 +371,10 @@
          /* Ok, the owner of this shms segment is dead, so, let's remove the segment */
          segment_name(fn, sizeof(fn), id);
  
diff --git a/sound/pulseaudio/patches/003-caps.patch b/sound/pulseaudio/patches/003-caps.patch
new file mode 100644
index 0000000000..af1b6a8011
--- /dev/null
+++ b/sound/pulseaudio/patches/003-caps.patch
@@ -0,0 +1,15 @@
+Index: pulseaudio-0.9.10/src/daemon/caps.c
+===================================================================
+--- pulseaudio-0.9.10.orig/src/daemon/caps.c	2008-04-11 13:28:12.000000000 +0200
++++ pulseaudio-0.9.10/src/daemon/caps.c	2008-04-11 13:28:13.000000000 +0200
+@@ -131,9 +131,8 @@
+     return 0;
+ }
+ 
+-int pa_drop_caps(void) {
++void pa_drop_caps(void) {
+     pa_drop_root();
+-    return 0;
+ }
+ 
+ #endif