pulseaudio-git: Local patch has been merged

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jan 9 00:18:23 2016 +0100
Changeset:	6d4f9366db2ed04b8e4dfa73af32ac3a80f4f64c

Modified Files:
	pulseaudio-git/distinfo
	pulseaudio-git/patches/patch-configure.ac
Removed Files:
	pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
	pulseaudio-git/patches/patch-src_tests_mult-s16-test.c

Log Message:
pulseaudio-git: Local patch has been merged

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

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

diffstat:
 pulseaudio-git/distinfo                            |  4 +--
 pulseaudio-git/patches/patch-configure.ac          | 32 +++++-----------------
 .../patches/patch-src_pulsecore_sample-util.h      | 13 ---------
 .../patches/patch-src_tests_mult-s16-test.c        | 20 --------------
 4 files changed, 8 insertions(+), 61 deletions(-)

diffs:
diff --git a/pulseaudio-git/distinfo b/pulseaudio-git/distinfo
index a876ca4..829aa34 100644
--- a/pulseaudio-git/distinfo
+++ b/pulseaudio-git/distinfo
@@ -5,14 +5,12 @@ 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) = bef8282af4a2051d9421c2bdc8e652254beeddd7
-SHA1 (patch-configure.ac) = 42930c9c8c2dac418630703da9010dd00de23eb8
+SHA1 (patch-configure.ac) = 8982063a47ef70c272e84425be0cdf7315a9e6d2
 SHA1 (patch-src_Makefile.am) = 4533c3123d4beba08165e40137b73ae37ce62b31
 SHA1 (patch-src_modules_module-detect.c) = 4e1db6d3b3224c097ecd981d3f055880ecff780a
 SHA1 (patch-src_modules_module-solaris.c) = 814fefd672f9db75ef3209b50538e2a71aceaf01
 SHA1 (patch-src_modules_oss_module-oss.c) = 6199e48a842dc076b14d039c249295566bcb2c03
 SHA1 (patch-src_pulsecore_mix__neon.c) = a0810584e0271b0e6ac019e0716e99f6022872ef
-SHA1 (patch-src_pulsecore_sample-util.h) = 6407a03409422fa20adcfcb5966065b96ad9c23b
 SHA1 (patch-src_pulsecore_svolume__mmx.c) = d94c619ce46f56d55a4964c2626b29cab097418a
 SHA1 (patch-src_pulsecore_svolume__sse.c) = 393528e041fdc22e1d5a8b840ed26ecf83e3f981
-SHA1 (patch-src_tests_mult-s16-test.c) = 2927296b74b8599bfb7091713f939b192f0bd9be
 SHA1 (patch-src_tests_rtpoll-test.c) = 2f9f1a523dd2375827ed9a96f32f531592cc423f
diff --git a/pulseaudio-git/patches/patch-configure.ac b/pulseaudio-git/patches/patch-configure.ac
index aa5f543..e4e1e06 100644
--- a/pulseaudio-git/patches/patch-configure.ac
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -6,7 +6,7 @@ $NetBSD$
   file framework will install them in the right place.
 * Avoid hardcoded SDK paths on Darwin.
 
---- configure.ac.orig	2015-12-19 23:04:33.000000000 +0000
+--- configure.ac.orig	2016-01-08 22:26:44.000000000 +0000
 +++ configure.ac
 @@ -21,7 +21,7 @@
  
@@ -25,25 +25,7 @@ $NetBSD$
          os_is_linux=1
      ;;
      freebsd*)
-@@ -463,6 +462,17 @@ AC_TYPE_OFF_T
- AC_TYPE_UID_T
- AC_CHECK_DECLS(environ)
- 
-+AC_CHECK_SIZEOF(void*)
-+
-+fast_64bit_operations="no"
-+# This check covers x32-ABI
-+AC_CHECK_DECL([__x86_64__], [fast_64bit_operations="yes"], [], [])
-+if test "x$fast_64bit_operations" = "xno"; then
-+    AS_IF([test $ac_cv_sizeof_voidp -ge 8], [fast_64bit_operations="yes"])
-+fi
-+
-+AS_IF([test "x$fast_64bit_operations" = "xyes"], AC_DEFINE([HAVE_FAST_64BIT_OPERATIONS], 1, [Have CPU with fast 64-bit operations?]))
-+
- # SIGXCPU
- AX_CHECK_DEFINE([signal.h], [SIGXCPU], [HAVE_SIGXCPU=1], [HAVE_SIGXCPU=0])
- AS_IF([test "x$HAVE_SIGXCPU" = "x1"], AC_DEFINE([HAVE_SIGXCPU], 1, [Have SIGXCPU?]))
-@@ -523,15 +533,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
@@ -61,7 +43,7 @@ $NetBSD$
      AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
      HAVE_BONJOUR=1
  fi
-@@ -769,6 +773,13 @@ AM_CONDITIONAL([HAVE_OSS_WRAPPER], [test
+@@ -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)?]))
  
@@ -75,7 +57,7 @@ $NetBSD$
  #### CoreAudio support (optional) ####
  
  AC_ARG_ENABLE([coreaudio-output],
-@@ -1002,7 +1013,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -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])
@@ -84,7 +66,7 @@ $NetBSD$
  AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
  	      [Fallback machine-id file])
  
-@@ -1325,9 +1336,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])
@@ -96,7 +78,7 @@ $NetBSD$
  AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
  
  PA_BINARY=${bindir}/pulseaudio${EXEEXT}
-@@ -1339,8 +1350,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])
  
@@ -108,7 +90,7 @@ $NetBSD$
  
  #### Mac OSX specific stuff #####
  
-@@ -1356,17 +1368,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")
  
diff --git a/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h b/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
deleted file mode 100644
index 5a42b0a..0000000
--- a/pulseaudio-git/patches/patch-src_pulsecore_sample-util.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/pulsecore/sample-util.h.orig	2015-12-05 22:03:14.000000000 +0000
-+++ src/pulsecore/sample-util.h
-@@ -55,7 +55,7 @@ void pa_deinterleave(const void *src, vo
- void pa_sample_clamp(pa_sample_format_t format, void *dst, size_t dstr, const void *src, size_t sstr, unsigned n);
- 
- static inline int32_t pa_mult_s16_volume(int16_t v, int32_t cv) {
--#if __WORDSIZE == 64 || ((ULONG_MAX) > (UINT_MAX))
-+#if HAVE_FAST_64BIT_OPERATIONS
-     /* Multiply with 64 bit integers on 64 bit platforms */
-     return (v * (int64_t) cv) >> 16;
- #else
diff --git a/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c b/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
deleted file mode 100644
index bc1bb7e..0000000
--- a/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- src/tests/mult-s16-test.c.orig	2015-12-05 22:03:14.000000000 +0000
-+++ src/tests/mult-s16-test.c
-@@ -93,12 +93,10 @@ int main(int argc, char *argv[]) {
-     if (!getenv("MAKE_CHECK"))
-         pa_log_set_level(PA_LOG_DEBUG);
- 
--#if __WORDSIZE == 64 || ((ULONG_MAX) > (UINT_MAX))
--    pa_log_debug("This seems to be 64-bit code.");
--#elif  __WORDSIZE == 32
--    pa_log_debug("This seems to be 32-bit code.");
-+#if HAVE_FAST_64BIT_OPERATIONS
-+    pa_log_debug("Detected CPU with fast 64-bit operations.");
- #else
--    pa_log_debug("Don't know if this is 32- or 64-bit code.");
-+    pa_log_debug("Not detected CPU with fast 64-bit operations.");
- #endif
- 
-     s = suite_create("Mult-s16");