pulseaudio-git: Remove patches merged upstream

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: pulseaudio-git: Remove patches merged upstream
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Mon, 07 Dec 2015 11:50:47 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Dec 7 12:50:47 2015 +0100
Changeset:	a7c2fd96a0137bb0a97ddfb1f0d109a25318688f

Modified Files:
	pulseaudio-git/distinfo
	pulseaudio-git/patches/patch-configure.ac
Removed Files:
	pulseaudio-git/patches/patch-src_pulsecore_core-util.c

Log Message:
pulseaudio-git: Remove patches merged upstream

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

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

diffstat:
 pulseaudio-git/distinfo                            |  3 +-
 pulseaudio-git/patches/patch-configure.ac          | 43 +++++-----------------
 .../patches/patch-src_pulsecore_core-util.c        | 25 -------------
 3 files changed, 10 insertions(+), 61 deletions(-)

diffs:
diff --git a/pulseaudio-git/distinfo b/pulseaudio-git/distinfo
index c6bf1c3..68c295b 100644
--- a/pulseaudio-git/distinfo
+++ b/pulseaudio-git/distinfo
@@ -5,14 +5,13 @@ 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) = b712baf1b15d01e7f6b8e17247c80f6b1c760a32
+SHA1 (patch-configure.ac) = 4b8e9d136202405f37d6aa695e38ecf2149391a1
 SHA1 (patch-src_Makefile.am) = 4533c3123d4beba08165e40137b73ae37ce62b31
 SHA1 (patch-src_daemon_caps.c) = 31403b3b7daae98b269077b1859afd12e3af948c
 SHA1 (patch-src_daemon_main.c) = d00ea97a3fd6e14976a0cc8eb7f7db811a990fe5
 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_core-util.c) = 046b3b2012091b6a12a1f1c45bfe5698140ea6ef
 SHA1 (patch-src_pulsecore_mix__neon.c) = a0810584e0271b0e6ac019e0716e99f6022872ef
 SHA1 (patch-src_pulsecore_sample-util.h) = 34600ac03317633700eb1295d28151a49144cb9e
 SHA1 (patch-src_pulsecore_svolume__mmx.c) = d94c619ce46f56d55a4964c2626b29cab097418a
diff --git a/pulseaudio-git/patches/patch-configure.ac b/pulseaudio-git/patches/patch-configure.ac
index 7fafd41..80e283e 100644
--- a/pulseaudio-git/patches/patch-configure.ac
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -8,7 +8,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
   file framework will install them in the right place.
 * Avoid hardcoded SDK paths on Darwin.
 
---- configure.ac.orig	2015-11-28 09:05:41.000000000 +0000
+--- configure.ac.orig	2015-12-07 11:45:13.000000000 +0000
 +++ configure.ac
 @@ -21,7 +21,7 @@
  
@@ -19,7 +19,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
  AC_CONFIG_SRCDIR([src/daemon/main.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_HEADERS([config.h])
-@@ -133,7 +133,6 @@ AC_MSG_CHECKING([host operating system])
+@@ -130,7 +130,6 @@ AC_MSG_CHECKING([host operating system])
  case "$host_os" in
      linux*)
          AC_MSG_RESULT([linux])
@@ -27,7 +27,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
          os_is_linux=1
      ;;
      freebsd*)
-@@ -260,6 +259,11 @@ else
+@@ -257,6 +256,11 @@ else
      # HW specific atomic ops stuff
      AC_MSG_CHECKING([architecture for native atomic operations])
      case $host in
@@ -39,7 +39,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
          arm*)
              AC_MSG_RESULT([arm])
              AC_MSG_CHECKING([whether we can use Linux kernel helpers])
-@@ -295,10 +299,6 @@ else
+@@ -292,10 +296,6 @@ else
                  ])
              fi
          ;;
@@ -50,32 +50,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
          *-freebsd*)
              AC_MSG_RESULT([yes])
              need_libatomic_ops=no
-@@ -447,6 +447,7 @@ AC_CHECK_HEADERS_ONCE([sys/eventfd.h])
- AC_CHECK_HEADERS_ONCE([execinfo.h])
- AC_CHECK_HEADERS_ONCE([langinfo.h])
- AC_CHECK_HEADERS_ONCE([regex.h pcreposix.h])
-+AC_CHECK_HEADERS_ONCE([locale.h xlocale.h])
- 
- AM_CONDITIONAL(HAVE_SYS_EVENTFD_H, test "x$ac_cv_header_sys_eventfd_h" = "xyes")
- 
-@@ -488,14 +489,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye
- #### Thread support ####
- 
- AX_TLS
--AS_IF([test "$ac_cv_tls" == "__thread"],
-+AS_IF([test "$ac_cv_tls" = "__thread"],
-     AC_DEFINE([SUPPORT_TLS___THREAD], 1, [Define this if the compiler supports __thread for Thread-Local Storage]))
- 
- # Win32 build breaks with win32 pthread installed
- AS_IF([test "x$os_is_win32" != "x1"],
-   [AX_PTHREAD])
- 
--AS_IF([test "x$ax_pthread_ok" == "xyes"],
-+AS_IF([test "x$ax_pthread_ok" = "xyes"],
-     AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris]))
- 
- 
-@@ -522,15 +523,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
+@@ -520,15 +520,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
@@ -93,7 +68,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
-@@ -1001,7 +996,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -999,7 +993,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])
@@ -102,7 +77,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])
  
-@@ -1324,9 +1319,9 @@ fi
+@@ -1322,9 +1316,9 @@ fi
  
  PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
  AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -114,7 +89,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}
-@@ -1338,8 +1333,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1336,8 +1330,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
  AC_SUBST(PA_SOEXT, [.so])
  AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
  
@@ -126,7 +101,7 @@ $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $
  
  #### Mac OSX specific stuff #####
  
-@@ -1355,17 +1351,6 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1353,17 +1348,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_core-util.c b/pulseaudio-git/patches/patch-src_pulsecore_core-util.c
deleted file mode 100644
index 26f5f8d..0000000
--- a/pulseaudio-git/patches/patch-src_pulsecore_core-util.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_pulsecore_core-util.c,v 1.1 2015/09/25 14:37:27 ryoon Exp $
-
---- src/pulsecore/core-util.c.orig	2015-11-28 09:05:41.000000000 +0000
-+++ src/pulsecore/core-util.c
-@@ -52,8 +52,11 @@
- #include <pcreposix.h>
- #endif
- 
--#ifdef HAVE_STRTOD_L
-+#ifdef HAVE_LOCALE_H
- #include <locale.h>
-+#endif
-+
-+#ifdef HAVE_XLOCALE_H
- #include <xlocale.h>
- #endif
- 
-@@ -106,7 +109,6 @@
- #endif
- 
- #ifdef __APPLE__
--#include <xlocale.h>
- #include <mach/mach_init.h>
- #include <mach/thread_act.h>
- #include <mach/thread_policy.h>
Prev by Date: Add a letsencrypt example config file, and a MESSAGE file.
Next by Date: Use common values from py-carbon/Makefile.common.
Previous by Thread: Add a letsencrypt example config file, and a MESSAGE file.
Next by Thread: Use common values from py-carbon/Makefile.common.
Indexes:
Home | Main Index | Thread Index | Old Index