pulseaudio-git: Add patch for missing __WORDSIZE reusing sizeof(void*)

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Dec 10 05:12:37 2015 +0100
Changeset:	5a82cff71bef5c01c13279b899fae8f929953b36

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

Log Message:
pulseaudio-git: Add patch for missing __WORDSIZE reusing sizeof(void*)

This patch obsoletes the previous one hardcoding __WORDSIZE.

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

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          | 22 +++++++++++----
 .../patches/patch-src_tests_mult-s16-test.c        | 33 +++++++++++++---------
 3 files changed, 37 insertions(+), 22 deletions(-)

diffs:
diff --git a/pulseaudio-git/distinfo b/pulseaudio-git/distinfo
index a84d730..781c6dc 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) = 785eac0fc6c74187b4608ef3f9c4e9c0ab152909
+SHA1 (patch-configure.ac) = 18ae809e829573af27e148d0846d92c83f8436ce
 SHA1 (patch-src_Makefile.am) = 4533c3123d4beba08165e40137b73ae37ce62b31
 SHA1 (patch-src_daemon_caps.c) = 31403b3b7daae98b269077b1859afd12e3af948c
 SHA1 (patch-src_daemon_main.c) = d00ea97a3fd6e14976a0cc8eb7f7db811a990fe5
@@ -16,5 +16,5 @@ SHA1 (patch-src_pulsecore_mix__neon.c) = a0810584e0271b0e6ac019e0716e99f6022872e
 SHA1 (patch-src_pulsecore_sample-util.h) = 34600ac03317633700eb1295d28151a49144cb9e
 SHA1 (patch-src_pulsecore_svolume__mmx.c) = d94c619ce46f56d55a4964c2626b29cab097418a
 SHA1 (patch-src_pulsecore_svolume__sse.c) = 393528e041fdc22e1d5a8b840ed26ecf83e3f981
-SHA1 (patch-src_tests_mult-s16-test.c) = dc17680fdda10b18987cd59deeb8b3e1a9fc68b1
+SHA1 (patch-src_tests_mult-s16-test.c) = 5a6195c9274783bbcfad728608b84e3dde87afa5
 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 bdb20a3..0a5849a 100644
--- a/pulseaudio-git/patches/patch-configure.ac
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
+$NetBSD$
 
 * Don't assume sys/capability.h is guaranteed present on Linux.
 * Adapt /var-paths for pkgsrc defaults.
@@ -25,7 +25,17 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
          os_is_linux=1
      ;;
      freebsd*)
-@@ -523,15 +522,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
+@@ -463,6 +462,9 @@ AC_TYPE_OFF_T
+ AC_TYPE_UID_T
+ AC_CHECK_DECLS(environ)
+ 
++# Used to deduct CPU word size
++AC_CHECK_SIZEOF(void*)
++
+ # 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 +525,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
@@ -43,7 +53,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
-@@ -1002,7 +995,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -1002,7 +998,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])
@@ -52,7 +62,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])
  
-@@ -1325,9 +1318,9 @@ fi
+@@ -1325,9 +1321,9 @@ fi
  
  PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
  AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -64,7 +74,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}
-@@ -1339,8 +1332,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1339,8 +1335,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
  AC_SUBST(PA_SOEXT, [.so])
  AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
  
@@ -76,7 +86,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
  
  #### Mac OSX specific stuff #####
  
-@@ -1356,17 +1350,6 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1356,17 +1353,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_tests_mult-s16-test.c b/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
index cf4c255..43cc291 100644
--- a/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
+++ b/pulseaudio-git/patches/patch-src_tests_mult-s16-test.c
@@ -2,20 +2,25 @@ $NetBSD: patch-src_tests_mult-s16-test.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
 
 Define glibc-specific (?) __WORDSIZE.
 
---- src/tests/mult-s16-test.c.orig	2015-11-28 09:05:41.000000000 +0000
+--- src/tests/mult-s16-test.c.orig	2015-12-07 11:45:13.000000000 +0000
 +++ src/tests/mult-s16-test.c
-@@ -28,6 +28,14 @@
- #include <pulsecore/random.h>
- #include <pulsecore/macro.h>
+@@ -23,6 +23,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <math.h>
++#include <limits.h>
  
-+#if !defined __WORDSIZE
-+# if defined __LP64__
-+#  define __WORDSIZE     64
-+# else
-+#  define __WORDSIZE     32
-+# endif
-+#endif
-+
- #include "runtime-test-util.h"
+ #include <pulse/rtclock.h>
+ #include <pulsecore/random.h>
+@@ -93,9 +94,9 @@ int main(int argc, char *argv[]) {
+     if (!getenv("MAKE_CHECK"))
+         pa_log_set_level(PA_LOG_DEBUG);
  
- static inline int32_t pa_mult_s16_volume_32(int16_t v, int32_t cv) {
+-#if __WORDSIZE == 64 || ((ULONG_MAX) > (UINT_MAX))
++#if (SIZEOF_VOIDP * CHAR_BIT) == 64
+     pa_log_debug("This seems to be 64-bit code.");
+-#elif  __WORDSIZE == 32
++#elif (SIZEOF_VOIDP * CHAR_BIT) == 32
+     pa_log_debug("This seems to be 32-bit code.");
+ #else
+     pa_log_debug("Don't know if this is 32- or 64-bit code.");