summaryrefslogtreecommitdiff
path: root/audio/pulseaudio/patches/patch-configure.ac
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2016-01-22 19:29:11 +0000
committerryoon <ryoon@pkgsrc.org>2016-01-22 19:29:11 +0000
commitbbfc3c63b8fe378019a6cad693b3217570ba5ffc (patch)
tree75016824efdfcd62f8c246d62aaf69b2378d4b51 /audio/pulseaudio/patches/patch-configure.ac
parent6a1756cf1ea84f0e9ab9352be9478d2c01029118 (diff)
downloadpkgsrc-bbfc3c63b8fe378019a6cad693b3217570ba5ffc.tar.gz
Update to 8.0
* Based on wip/pulseaudio by kamil@ Changelog: Automatic routing more likely to change profile OS X and NetBSD support improvements Systemd journal logging for clients New LFE balance programming interface Module-dbus-protocol improvements More flexible configuration file handling pulsecore-8.0.so moved to a private directory New script for measuring memory consumption Various bug fixes and small improvements
Diffstat (limited to 'audio/pulseaudio/patches/patch-configure.ac')
-rw-r--r--audio/pulseaudio/patches/patch-configure.ac70
1 files changed, 22 insertions, 48 deletions
diff --git a/audio/pulseaudio/patches/patch-configure.ac b/audio/pulseaudio/patches/patch-configure.ac
index 98ff6563eba..758b21d3b5d 100644
--- a/audio/pulseaudio/patches/patch-configure.ac
+++ b/audio/pulseaudio/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.6 2016/01/22 19:29:11 ryoon Exp $
* Don't assume sys/capability.h is guaranteed present on Linux.
* Fix NetBSD detection for libatomics_ops check.
@@ -8,7 +8,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
file framework will install them in the right place.
* Avoid hardcoded SDK paths on Darwin.
---- configure.ac.orig 2015-02-12 14:10:35.000000000 +0000
+--- configure.ac.orig 2016-01-22 07:33:38.000000000 +0000
+++ configure.ac
@@ -21,7 +21,7 @@
@@ -19,7 +19,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
AC_CONFIG_SRCDIR([src/daemon/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
-@@ -133,7 +133,6 @@ AC_MSG_CHECKING([host operating system])
+@@ -130,7 +130,6 @@ AC_MSG_CHECKING([host operating system])
case "$host_os" in
linux*)
AC_MSG_RESULT([linux])
@@ -27,47 +27,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
os_is_linux=1
;;
freebsd*)
-@@ -260,6 +259,11 @@ else
- # HW specific atomic ops stuff
- AC_MSG_CHECKING([architecture for native atomic operations])
- case $host in
-+ *-netbsd*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ need_libatomic_ops=no
-+ ;;
- arm*)
- AC_MSG_RESULT([arm])
- AC_MSG_CHECKING([whether we can use Linux kernel helpers])
-@@ -295,10 +299,6 @@ else
- ])
- fi
- ;;
-- *-netbsdelf5*)
-- AC_MSG_RESULT([yes])
-- need_libatomic_ops=no
-- ;;
- *-freebsd*)
- AC_MSG_RESULT([yes])
- need_libatomic_ops=no
-@@ -488,14 +488,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye
- #### Thread support ####
-
- AX_TLS
--AS_IF([test "$ac_cv_tls" == "__thread"],
-+AS_IF([test "$ac_cv_tls" = "__thread"],
- AC_DEFINE([SUPPORT_TLS___THREAD], 1, [Define this if the compiler supports __thread for Thread-Local Storage]))
-
- # Win32 build breaks with win32 pthread installed
- AS_IF([test "x$os_is_win32" != "x1"],
- [AX_PTHREAD])
-
--AS_IF([test "x$ax_pthread_ok" == "xyes"],
-+AS_IF([test "x$ax_pthread_ok" = "xyes"],
- AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris]))
-
-
-@@ -522,15 +522,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
+@@ -534,15 +533,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
if test "x$os_is_darwin" = "x1" ; then
AC_MSG_CHECKING([looking for Apple CoreService Framework])
# How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope
@@ -85,7 +45,21 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
HAVE_BONJOUR=1
fi
-@@ -1001,7 +995,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -780,6 +773,13 @@ AM_CONDITIONAL([HAVE_OSS_WRAPPER], [test
+ AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], AC_DEFINE([HAVE_OSS_OUTPUT], 1, [Have OSS output?]))
+ AS_IF([test "x$HAVE_OSS_WRAPPER" = "x1"], AC_DEFINE([HAVE_OSS_WRAPPER], 1, [Have OSS wrapper (padsp)?]))
+
++# Some platforms like SunOS (Illumos) may ship without SOUND_PCM_* functionality
++if test "x$HAVE_OSS" = "x1"; then
++ AC_CHECK_DECLS([SOUND_PCM_READ_RATE], [], [], [[#include <sys/soundcard.h>]])
++ AC_CHECK_DECLS([SOUND_PCM_READ_CHANNELS], [], [], [[#include <sys/soundcard.h>]])
++ AC_CHECK_DECLS([SOUND_PCM_READ_BITS], [], [], [[#include <sys/soundcard.h>]])
++fi
++
+ #### CoreAudio support (optional) ####
+
+ AC_ARG_ENABLE([coreaudio-output],
+@@ -1016,7 +1016,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
PA_MACHINE_ID="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
@@ -94,7 +68,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])
-@@ -1309,9 +1303,9 @@ fi
+@@ -1339,9 +1339,9 @@ fi
PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -106,7 +80,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
PA_BINARY=${bindir}/pulseaudio${EXEEXT}
-@@ -1323,8 +1317,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1353,8 +1353,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
AC_SUBST(PA_SOEXT, [.so])
AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
@@ -118,7 +92,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
#### Mac OSX specific stuff #####
-@@ -1340,17 +1335,6 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1370,17 +1371,6 @@ AC_ARG_WITH(mac-sysroot,
AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]),
mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk")