pulseaudio-git: Reduce local patch, improved version of it merged upstream

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Dec 8 12:31:15 2015 +0100
Changeset:	518bcc5d2216a1f159a8c2eca9c3f0f7488eeb1a

Modified Files:
	pulseaudio-git/distinfo
	pulseaudio-git/patches/patch-configure.ac

Log Message:
pulseaudio-git: Reduce local patch, improved version of it merged upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=518bcc5d2216a1f159a8c2eca9c3f0f7488eeb1a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pulseaudio-git/distinfo                   |  2 +-
 pulseaudio-git/patches/patch-configure.ac | 36 ++++++-------------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diffs:
diff --git a/pulseaudio-git/distinfo b/pulseaudio-git/distinfo
index 29504df..a84d730 100644
--- a/pulseaudio-git/distinfo
+++ b/pulseaudio-git/distinfo
@@ -5,7 +5,7 @@ RMD160 (pulseaudio-7.1.tar.gz) = f6138695f1cfddfcb72654e8b204b0731c8a2234
 SHA512 (pulseaudio-7.1.tar.gz) = c2b8946a4dfb4fa2a8c7a504d9375bd51086c0f2f40aa6ddbb56115815a01665f491507d367baa375bc9595e31bb0d88f15208a1c2ad507bfa40e1bde1213091
 Size (pulseaudio-7.1.tar.gz) = 2686090 bytes
 SHA1 (patch-aa) = b4143badf668a0887c903971bf26cd4d5b1604b4
-SHA1 (patch-configure.ac) = c0dee9d95b1bbcc7fab38aa4c8510cc987fa3451
+SHA1 (patch-configure.ac) = 785eac0fc6c74187b4608ef3f9c4e9c0ab152909
 SHA1 (patch-src_Makefile.am) = 4533c3123d4beba08165e40137b73ae37ce62b31
 SHA1 (patch-src_daemon_caps.c) = 31403b3b7daae98b269077b1859afd12e3af948c
 SHA1 (patch-src_daemon_main.c) = d00ea97a3fd6e14976a0cc8eb7f7db811a990fe5
diff --git a/pulseaudio-git/patches/patch-configure.ac b/pulseaudio-git/patches/patch-configure.ac
index 9c548be..bdb20a3 100644
--- a/pulseaudio-git/patches/patch-configure.ac
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -1,13 +1,12 @@
 $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
 
 * Don't assume sys/capability.h is guaranteed present on Linux.
-* Fix NetBSD detection for libatomics_ops check.
 * 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	2015-12-07 11:45:13.000000000 +0000
+--- configure.ac.orig	2015-12-08 11:29:36.000000000 +0000
 +++ configure.ac
 @@ -21,7 +21,7 @@
  
@@ -26,30 +25,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
          os_is_linux=1
      ;;
      freebsd*)
-@@ -257,6 +256,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])
-@@ -292,10 +296,6 @@ else
-                 ])
-             fi
-         ;;
--        *-netbsdelf5*)
--            AC_MSG_RESULT([yes])
--            need_libatomic_ops=no
--        ;;
-         *-freebsd*)
-             AC_MSG_RESULT([yes])
-             need_libatomic_ops=no
-@@ -520,15 +520,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
+@@ -523,15 +522,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
@@ -67,7 +43,7 @@ $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
-@@ -999,7 +993,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -1002,7 +995,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])
@@ -76,7 +52,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])
  
-@@ -1322,9 +1316,9 @@ fi
+@@ -1325,9 +1318,9 @@ fi
  
  PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
  AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -88,7 +64,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}
-@@ -1336,8 +1330,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1339,8 +1332,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
  AC_SUBST(PA_SOEXT, [.so])
  AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
  
@@ -100,7 +76,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
  
  #### Mac OSX specific stuff #####
  
-@@ -1353,17 +1348,6 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1356,17 +1350,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")