diff options
-rw-r--r-- | audio/pulseaudio/distinfo | 4 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-configure.ac | 34 |
2 files changed, 26 insertions, 12 deletions
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 1f7cd4fa64c..9289d54558f 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.46 2014/08/07 07:43:48 spz Exp $ +$NetBSD: distinfo,v 1.47 2015/01/26 14:08:21 jperkin Exp $ SHA1 (pulseaudio-5.0.tar.xz) = e420931a0b9cf37331cd06e30ba415046317ab85 RMD160 (pulseaudio-5.0.tar.xz) = 4ba13e92c58f8ada4542d521131094a55e3b6991 Size (pulseaudio-5.0.tar.xz) = 1455428 bytes SHA1 (patch-aa) = 4e8a38810453d0efad287528b7f18c056a5cdd8b -SHA1 (patch-configure.ac) = f7c54eca4613c6f14732683f2f24ca81f723320d +SHA1 (patch-configure.ac) = 6de1f6eea165f4019b6894f3484532bb813e6994 SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02 SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a diff --git a/audio/pulseaudio/patches/patch-configure.ac b/audio/pulseaudio/patches/patch-configure.ac index 16dd762198c..d87106e8f85 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.2 2014/06/11 01:33:59 dsainty Exp $ +$NetBSD: patch-configure.ac,v 1.3 2015/01/26 14:08:21 jperkin Exp $ * Don't assume sys/capability.h is guaranteed present on Linux. * Fix NetBSD detection for libatomics_ops check. @@ -6,10 +6,11 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ * Adapt /var-paths for pkgsrc defaults. * Install default config files in example directory; pkgsrc config file framework will install them in the right place. +* Avoid hardcoded SDK paths on Darwin. ---- configure.ac.orig 2014-02-15 21:33:32.000000000 +1300 -+++ configure.ac 2014-06-10 22:41:22.709548244 +1200 -@@ -130,7 +130,6 @@ +--- configure.ac.orig 2014-02-15 08:33:32.000000000 +0000 ++++ configure.ac +@@ -130,7 +130,6 @@ AC_MSG_CHECKING([host operating system]) case "$host_os" in linux*) AC_MSG_RESULT([linux]) @@ -17,7 +18,7 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ os_is_linux=1 ;; freebsd*) -@@ -251,6 +250,11 @@ +@@ -251,6 +250,11 @@ else # HW specific atomic ops stuff AC_MSG_CHECKING([architecture for native atomic operations]) case $host in @@ -29,7 +30,7 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ arm*) AC_MSG_RESULT([arm]) AC_MSG_CHECKING([whether we can use Linux kernel helpers]) -@@ -286,10 +290,6 @@ +@@ -286,10 +290,6 @@ else ]) fi ;; @@ -40,7 +41,7 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ *-freebsd*) AC_MSG_RESULT([yes]) need_libatomic_ops=no -@@ -478,14 +478,14 @@ +@@ -478,14 +478,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye #### Thread support #### AX_TLS @@ -57,7 +58,7 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris])) -@@ -988,7 +988,7 @@ +@@ -988,7 +988,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]) @@ -66,7 +67,7 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK, [Fallback machine-id file]) -@@ -1234,9 +1234,9 @@ +@@ -1234,9 +1234,9 @@ fi PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse" AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir]) @@ -78,7 +79,7 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir]) PA_BINARY=${bindir}/pulseaudio${EXEEXT} -@@ -1248,8 +1248,9 @@ +@@ -1248,8 +1248,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY AC_SUBST(PA_SOEXT, [.so]) AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension]) @@ -90,3 +91,16 @@ $NetBSD: patch-configure.ac,v 1.2 2014/06/11 01:33:59 dsainty Exp $ #### Mac OSX specific stuff ##### +@@ -1266,8 +1267,10 @@ AC_ARG_WITH(mac-sysroot, + mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk") + + if test "x$os_is_darwin" = "x1" ; then +- LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" +- CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" ++ if test -d "$mac_sysroot" ; then ++ LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" ++ CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" ++ fi + + if test "x$enable_mac_universal" = "xyes" ; then + mac_arches="-arch i386 -arch x86_64" |