From 3c698a22985122d2cdbba0d68b0c6c251bd05a57 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sun, 1 Nov 2015 19:23:21 +0100
Subject: pulseaudio: update to latest, fix musl build with patchset from
 VoidLinux

---
 package/pulseaudio/Makefile                             |  6 ++----
 package/pulseaudio/patches/patch-configure_ac           | 13 +++++++++++--
 .../pulseaudio/patches/patch-src_pulsecore_core-util_c  | 13 +++++++++++++
 .../patches/patch-src_pulsecore_sample-util_h           | 17 +++++++++++++++++
 4 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 package/pulseaudio/patches/patch-src_pulsecore_core-util_c
 create mode 100644 package/pulseaudio/patches/patch-src_pulsecore_sample-util_h

(limited to 'package')

diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index a18214f42..645be21c3 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		pulseaudio
-PKG_VERSION:=		6.0
+PKG_VERSION:=		7.1
 PKG_RELEASE:=		1
-PKG_HASH:=		b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6
+PKG_HASH:=		e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9
 PKG_DESCR:=		sound system
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		libltdl json-c libsndfile libspeex libncurses
@@ -18,8 +18,6 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
 PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc-ng glibc
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/pulseaudio/patches/patch-configure_ac b/package/pulseaudio/patches/patch-configure_ac
index 2bae7b834..5c26f33f7 100644
--- a/package/pulseaudio/patches/patch-configure_ac
+++ b/package/pulseaudio/patches/patch-configure_ac
@@ -1,5 +1,5 @@
---- pulseaudio-6.0.orig/configure.ac	2015-02-12 15:10:35.000000000 +0100
-+++ pulseaudio-6.0/configure.ac	2015-06-04 12:20:45.000000000 +0200
+--- pulseaudio-7.1.orig/configure.ac	2015-10-30 13:22:13.000000000 +0100
++++ pulseaudio-7.1/configure.ac	2015-11-01 18:51:35.000000000 +0100
 @@ -99,25 +99,8 @@ PKG_PROG_PKG_CONFIG
  
  # gettext
@@ -26,3 +26,12 @@
  
  #### Determine host OS ####
  
+@@ -407,7 +390,7 @@ AC_HEADER_STDC
+ # POSIX
+ AC_CHECK_HEADERS_ONCE([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
+     netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
+-    sys/mman.h sys/select.h sys/socket.h sys/wait.h \
++    sys/mman.h sys/select.h sys/socket.h sys/wait.h sys/user.h xlocale.h \
+     sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
+ AC_CHECK_HEADERS([netinet/ip.h], [], [],
+                  [#include <sys/types.h>
diff --git a/package/pulseaudio/patches/patch-src_pulsecore_core-util_c b/package/pulseaudio/patches/patch-src_pulsecore_core-util_c
new file mode 100644
index 000000000..a270fca9f
--- /dev/null
+++ b/package/pulseaudio/patches/patch-src_pulsecore_core-util_c
@@ -0,0 +1,13 @@
+--- pulseaudio-7.1.orig/src/pulsecore/core-util.c	2015-10-30 13:14:56.000000000 +0100
++++ pulseaudio-7.1/src/pulsecore/core-util.c	2015-11-01 18:52:47.000000000 +0100
+@@ -54,7 +54,9 @@
+ 
+ #ifdef HAVE_STRTOD_L
+ #include <locale.h>
+-#include <xlocale.h>
++# ifdef HAVE_XLOCALE_H
++#  include <xlocale.h>
++# endif
+ #endif
+ 
+ #ifdef HAVE_SCHED_H
diff --git a/package/pulseaudio/patches/patch-src_pulsecore_sample-util_h b/package/pulseaudio/patches/patch-src_pulsecore_sample-util_h
new file mode 100644
index 000000000..15b0996b8
--- /dev/null
+++ b/package/pulseaudio/patches/patch-src_pulsecore_sample-util_h
@@ -0,0 +1,17 @@
+--- pulseaudio-7.1.orig/src/pulsecore/sample-util.h	2015-09-10 06:51:41.000000000 +0200
++++ pulseaudio-7.1/src/pulsecore/sample-util.h	2015-11-01 18:52:13.000000000 +0100
+@@ -24,6 +24,14 @@
+ #include <inttypes.h>
+ #include <limits.h>
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_SYS_USER_H
++#include <sys/user.h>	/* required by _WORDIZE with musl */
++#endif
++
+ #include <pulse/gccmacro.h>
+ #include <pulse/sample.h>
+ #include <pulse/volume.h>
-- 
cgit v1.2.3