Re: audio/pulseaudio OS X configure patch

[Mansour Moufid <mansourmoufid%gmail.com@localhost>]

This is a follow-up to my previous message, with a patch for (the
existing patch for) the configure.ac file.

Yours,
Mansour


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/distinfo,v
retrieving revision 1.49
diff -u -p -u -r1.49 distinfo
--- distinfo	21 Feb 2015 23:13:10 -0000	1.49
+++ distinfo	23 Feb 2015 23:50:04 -0000
@@ -4,7 +4,7 @@ SHA1 (pulseaudio-6.0.tar.xz) = 3607d523f
 RMD160 (pulseaudio-6.0.tar.xz) = a3f96cabc2872646c34ba581d6044dc4a6513fd9
 Size (pulseaudio-6.0.tar.xz) = 1469248 bytes
 SHA1 (patch-aa) = 4e8a38810453d0efad287528b7f18c056a5cdd8b
-SHA1 (patch-configure.ac) = e5c90f38f3d06af64579176495a4023281ac0699
+SHA1 (patch-configure.ac) = 7a28414a7e878f1655a51bb9ffe9f0b99c896de9
 SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
 SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c
 SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a
Index: patches/patch-configure.ac
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/patches/patch-configure.ac,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-configure.ac
--- patches/patch-configure.ac	27 Jan 2015 04:04:50 -0000	1.4
+++ patches/patch-configure.ac	23 Feb 2015 23:50:04 -0000
@@ -8,9 +8,9 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
   file framework will install them in the right place.
 * Avoid hardcoded SDK paths on Darwin.
 
---- configure.ac.orig	2014-02-15 08:33:32.000000000 +0000
+--- configure.ac.orig	2015-02-12 14:10:35.000000000 +0000
 +++ configure.ac
-@@ -130,7 +130,6 @@ AC_MSG_CHECKING([host operating system])
+@@ -133,7 +133,6 @@ AC_MSG_CHECKING([host operating system])
  case "$host_os" in
      linux*)
          AC_MSG_RESULT([linux])
@@ -18,7 +18,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
          os_is_linux=1
      ;;
      freebsd*)
-@@ -251,6 +250,11 @@ else
+@@ -260,6 +259,11 @@ else
      # HW specific atomic ops stuff
      AC_MSG_CHECKING([architecture for native atomic operations])
      case $host in
@@ -30,7 +30,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
          arm*)
              AC_MSG_RESULT([arm])
              AC_MSG_CHECKING([whether we can use Linux kernel helpers])
-@@ -286,10 +290,6 @@ else
+@@ -295,10 +299,6 @@ else
                  ])
              fi
          ;;
@@ -41,7 +41,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
          *-freebsd*)
              AC_MSG_RESULT([yes])
              need_libatomic_ops=no
-@@ -478,14 +478,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye
+@@ -488,14 +488,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye
  #### Thread support ####
  
  AX_TLS
@@ -58,7 +58,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
      AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris]))
  
  
-@@ -512,15 +512,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
+@@ -522,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
@@ -76,7 +76,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
      AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
      HAVE_BONJOUR=1
  fi
-@@ -988,7 +982,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -1001,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])
@@ -85,7 +85,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
  AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
  	      [Fallback machine-id file])
  
-@@ -1234,9 +1228,9 @@ fi
+@@ -1309,9 +1303,9 @@ fi
  
  PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
  AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -97,7 +97,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
  AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
  
  PA_BINARY=${bindir}/pulseaudio${EXEEXT}
-@@ -1248,8 +1242,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1323,8 +1317,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
  AC_SUBST(PA_SOEXT, [.so])
  AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
  
@@ -109,10 +109,17 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
  
  #### Mac OSX specific stuff #####
  
-@@ -1265,17 +1260,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")
+@@ -1334,22 +1329,11 @@ AC_ARG_ENABLE(mac-universal,
+ 
+ AC_ARG_WITH(mac-version-min,
+     AS_HELP_STRING([--with-mac-version-min=<version>], [Defines the earliest version of MacOS X that the executables will run on.]),
+-    mac_version_min=$withval, mac_version_min="10.5")
++    mac_version_min=$withval)
  
+ 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")
+-
 -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"
@@ -123,7 +130,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/0
 -        CFLAGS="$CFLAGS $mac_arches"
 -    fi
 -fi
--
++    mac_sysroot=$withval)
+ 
  AC_ARG_ENABLE([webrtc-aec],
      AS_HELP_STRING([--enable-webrtc-aec], [Enable the optional WebRTC-based echo canceller]))
-