gc old patches, no longer necessary for pa 0.9.21

8 files changed, 0 insertions, 398 deletions

diff --git a/audio/pulseaudio/patches/patch-ah b/audio/pulseaudio/patches/patch-ah
deleted file mode 100644
index b2eda322c7e..00000000000
--- a/audio/pulseaudio/patches/patch-ah
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/12/23 02:15:27 hasso Exp $
-
---- src/pulsecore/core-util.c.orig	2008-12-21 23:55:12 +0200
-+++ src/pulsecore/core-util.c	2008-12-22 00:26:22 +0200
-@@ -1026,12 +1026,21 @@ int pa_uid_in_group(uid_t uid, const cha
-     char **i;
-     int r = -1;
- 
-+#ifdef _SC_GETGR_R_SIZE_MAX
-     g_n = sysconf(_SC_GETGR_R_SIZE_MAX);
-     g_buf = pa_xmalloc((size_t) g_n);
-+#else
-+    g_buf = pa_xmalloc(512);
-+#endif
- 
-+#ifdef _SC_GETPW_R_SIZE_MAX
-     p_n = sysconf(_SC_GETPW_R_SIZE_MAX);
-     p_buf = pa_xmalloc((size_t) p_n);
-+#else
-+    p_buf = pa_xmalloc(512);
-+#endif
- 
-+#ifdef HAVE_GETGRNAM_R
-     errno = 0;
-     if (getgrnam_r(name, &grbuf, g_buf, (size_t) g_n, &gr) != 0 || !gr) {
- 
-@@ -1040,14 +1049,28 @@ int pa_uid_in_group(uid_t uid, const cha
- 
-         goto finish;
-     }
-+#else
-+    gr = getgrnam(name);
-+
-+    if (gr == NULL) {
-+        errno = ENOENT;
-+        goto finish;
-+    }
-+#endif
- 
-     r = 0;
-     for (i = gr->gr_mem; *i; i++) {
-         struct passwd pwbuf, *pw;
- 
-+#ifdef HAVE_GETPWNAM_R
-         errno = 0;
-         if (getpwnam_r(*i, &pwbuf, p_buf, (size_t) p_n, &pw) != 0 || !pw)
-             continue;
-+#else
-+	pw = getpwnam(*i);
-+        if (pw == NULL)
-+            continue;
-+#endif
- 
-         if (pw->pw_uid == uid) {
-             r = 1;
-@@ -1069,9 +1092,14 @@ gid_t pa_get_gid_of_group(const char *na
-     long g_n;
-     struct group grbuf, *gr;
- 
-+#ifdef _SC_GETGR_R_SIZE_MAX
-     g_n = sysconf(_SC_GETGR_R_SIZE_MAX);
-     g_buf = pa_xmalloc((size_t) g_n);
-+#else
-+    g_buf = pa_xmalloc(512);
-+#endif
- 
-+#ifdef HAVE_GETGRNAM_R
-     errno = 0;
-     if (getgrnam_r(name, &grbuf, g_buf, (size_t) g_n, &gr) != 0 || !gr) {
- 
-@@ -1080,6 +1108,14 @@ gid_t pa_get_gid_of_group(const char *na
- 
-         goto finish;
-     }
-+#else
-+    gr = getgrnam(name);
-+
-+    if (gr == NULL) {
-+        errno = ENOENT;
-+        goto finish;
-+    }
-+#endif
- 
-     ret = gr->gr_gid;
- 
diff --git a/audio/pulseaudio/patches/patch-ai b/audio/pulseaudio/patches/patch-ai
deleted file mode 100644
index 63c879ac332..00000000000
--- a/audio/pulseaudio/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/12/23 02:15:27 hasso Exp $
-
---- src/modules/rtp/rtp.c.orig	2008-12-22 00:50:26 +0200
-+++ src/modules/rtp/rtp.c	2008-12-22 00:51:41 +0200
-@@ -35,6 +35,10 @@
- #include <sys/filio.h>
- #endif
- 
-+#ifdef HAVE_SYS_UIO_H
-+#include <sys/uio.h>
-+#endif
-+
- #include <pulsecore/core-error.h>
- #include <pulsecore/log.h>
- #include <pulsecore/macro.h>
diff --git a/audio/pulseaudio/patches/patch-aj b/audio/pulseaudio/patches/patch-aj
deleted file mode 100644
index 64b53ed4b77..00000000000
--- a/audio/pulseaudio/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2008/12/23 02:15:27 hasso Exp $
-
---- src/modules/rtp/sap.c.orig	2008-12-22 00:52:17 +0200
-+++ src/modules/rtp/sap.c	2008-12-22 00:52:43 +0200
-@@ -38,6 +38,10 @@
- #include <sys/filio.h>
- #endif
- 
-+#ifdef HAVE_SYS_UIO_H
-+#include <sys/uio.h>
-+#endif
-+
- #include <pulse/xmalloc.h>
- 
- #include <pulsecore/core-error.h>
diff --git a/audio/pulseaudio/patches/patch-ak b/audio/pulseaudio/patches/patch-ak
deleted file mode 100644
index 945ff7ade43..00000000000
--- a/audio/pulseaudio/patches/patch-ak
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2009/01/08 12:11:46 dsainty Exp $
-
---- src/modules/module-oss.c.orig	2008-09-04 09:13:43.000000000 +1200
-+++ src/modules/module-oss.c	2009-01-08 20:55:21.000000000 +1300
-@@ -71,6 +71,11 @@
- #include <pulsecore/thread-mq.h>
- #include <pulsecore/rtpoll.h>
- 
-+#if defined(__NetBSD__) && !defined(SNDCTL_DSP_GETODELAY)
-+#include <sys/audioio.h>
-+#include <sys/syscall.h>
-+#endif
-+
- #include "oss-util.h"
- #include "module-oss-symdef.h"
- 
-@@ -399,13 +404,27 @@
- 
-     if (u->use_getodelay) {
-         int arg;
--
-+#if defined(__NetBSD__) && !defined(SNDCTL_DSP_GETODELAY)
-+#if defined(AUDIO_GETBUFINFO)
-+        struct audio_info info;
-+        if (syscall(SYS_ioctl, u->fd, AUDIO_GETBUFINFO, &info) < 0) {
-+            pa_log_info("Device doesn't support AUDIO_GETBUFINFO: %s", pa_cstrerror(errno));
-+            u->use_getodelay = 0;
-+        } else {
-+            arg = info.play.seek + info.blocksize / 2;
-+            r = pa_bytes_to_usec((size_t) arg, &u->sink->sample_spec);
-+        }
-+#else
-+        pa_log_info("System doesn't support AUDIO_GETBUFINFO");
-+        u->use_getodelay = 0;
-+#endif
-+#else
-         if (ioctl(u->fd, SNDCTL_DSP_GETODELAY, &arg) < 0) {
-             pa_log_info("Device doesn't support SNDCTL_DSP_GETODELAY: %s", pa_cstrerror(errno));
-             u->use_getodelay = 0;
-         } else
-             r = pa_bytes_to_usec((size_t) arg, &u->sink->sample_spec);
--
-+#endif
-     }
- 
-     if (!u->use_getodelay && u->use_getospace) {
diff --git a/audio/pulseaudio/patches/patch-al b/audio/pulseaudio/patches/patch-al
deleted file mode 100644
index 205c0ce5a9a..00000000000
--- a/audio/pulseaudio/patches/patch-al
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-al,v 1.2 2009/12/27 15:06:28 abs Exp $
-
---- src/pulsecore/core-util.c.orig	2009-12-27 14:25:19.000000000 +0000
-+++ src/pulsecore/core-util.c
-@@ -105,6 +105,10 @@
- #define MSG_NOSIGNAL 0
- #endif
- 
-+#ifdef __APPLE__
-+#include <xlocale.h>
-+#endif
-+
- #ifdef OS_IS_WIN32
- 
- #define PULSE_ROOTENV "PULSE_ROOT"
-@@ -687,11 +691,19 @@ int pa_raise_priority(int nice_level) {
- void pa_reset_priority(void) {
- #ifdef HAVE_SYS_RESOURCE_H
-     struct sched_param sp;
-+    int policy;
- 
-     setpriority(PRIO_PROCESS, 0, 0);
- 
-     memset(&sp, 0, sizeof(sp));
--    pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp) == 0);
-+    pa_assert_se(pthread_getschedparam(pthread_self(), &policy, &sp) == 0);
-+    /*
-+     * Set back to standard priority iff we previously set high_priority
-+     * Avoid assert on at least NetBSD 5 in !high_priority case
-+     */
-+    if (policy != SCHED_OTHER)
-+	pa_assert_se(pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp)
-+									== 0);
- #endif
- 
- #ifdef OS_IS_WIN32
diff --git a/audio/pulseaudio/patches/patch-am b/audio/pulseaudio/patches/patch-am
deleted file mode 100644
index 33dfc911312..00000000000
--- a/audio/pulseaudio/patches/patch-am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-am,v 1.1 2009/02/05 21:05:07 tron Exp $
-
---- src/pulsecore/proplist-util.c.orig	2009-01-12 23:10:34.000000000 +0000
-+++ src/pulsecore/proplist-util.c	2009-02-05 19:59:17.000000000 +0000
-@@ -35,9 +35,14 @@
- 
- #include "proplist-util.h"
- 
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- void pa_init_proplist(pa_proplist *p) {
-     int a, b;
--#if !HAVE_DECL_ENVIRON
-+#if !HAVE_DECL_ENVIRON && !defined(__APPLE__)
-     extern char **environ;
- #endif
-     char **e;
diff --git a/audio/pulseaudio/patches/patch-ba b/audio/pulseaudio/patches/patch-ba
deleted file mode 100644
index b96685e391a..00000000000
--- a/audio/pulseaudio/patches/patch-ba
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2009/09/18 09:59:54 joerg Exp $
-
---- configure.ac.orig	2009-01-13 00:44:27.000000000 +0100
-+++ configure.ac
-@@ -125,7 +125,18 @@ AC_ARG_ENABLE([atomic-arm-memory-barrier
-                 no) ;;
-                 *) AC_MSG_ERROR(bad value ${enableval} for --disable-atomic-arm-linux-helpers) ;;
-             esac
--        ],)
-+	],)
-+
-+AC_ARG_ENABLE([netbsd-atomic-ops],
-+    AS_HELP_STRING([--enable-netbsd-atomic-ops],[Use the native NetBSD atomic_ops implementation]),
-+        [
-+            case "${enableval}" in
-+                yes) atomic_netbsd_helpers=yes ;;
-+                no) atomic_netbsd_helpers=no ;;
-+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-netbsd-atomic-ops) ;;
-+            esac
-+        ],
-+	[atomic_netbsd_helpers=auto])
- 
- AC_MSG_CHECKING([target operating system])
- case $host in
-@@ -133,6 +144,10 @@ case $host in
- 	    AC_MSG_RESULT([linux])
- 	    pulse_target_os=linux
-     	;;
-+    	*-*-netbsd*)
-+	    AC_MSG_RESULT([netbsd])
-+	    pulse_target_os=netbsd
-+    	;;
- 	*)
- 	    AC_MSG_RESULT([unknown])
- 	    pulse_target_os=unknown
-@@ -193,7 +208,13 @@ else
- 	   fi
-       	;;
-         *)
--	    AC_MSG_RESULT([unknown])
-+	    if test "x$pulse_target_os" = "xnetbsd" && test "x$atomic_netbsd_helpers" = "xyes"; then
-+	        AC_MSG_RESULT([yes])
-+        	AC_DEFINE_UNQUOTED(NETBSD_ATOMIC_OPS, 1, [netbsd implementation])
-+    		need_libatomic_ops=no
-+	    else
-+	        AC_MSG_RESULT([unknown])
-+	    fi
-         ;;
-     esac
- fi
-@@ -263,7 +284,7 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
-     netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
-     sys/mman.h sys/resource.h sys/select.h sys/socket.h sys/wait.h \
--    syslog.h sys/dl.h dlfcn.h linux/sockios.h])
-+    sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
- AC_CHECK_HEADERS([netinet/ip.h], [], [],
- 		 [#include <sys/types.h>
- 		  #if HAVE_NETINET_IN_H
-@@ -292,6 +313,9 @@ AC_CHECK_HEADERS([sys/filio.h])
- # Windows
- AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h])
- 
-+# NetBSD
-+AC_CHECK_HEADERS([sys/atomic.h])
-+
- # Other
- AC_CHECK_HEADERS([sys/ioctl.h])
- AC_CHECK_HEADERS([byteswap.h])
-@@ -359,8 +383,8 @@ AC_CHECK_FUNCS([lrintf strtof])
- AC_FUNC_FORK
- AC_FUNC_GETGROUPS
- AC_FUNC_SELECT_ARGTYPES
--AC_CHECK_FUNCS([chmod chown clock_gettime getaddrinfo getgrgid_r \
--    getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \
-+AC_CHECK_FUNCS([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \
-+    getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \
-     pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
-     sigaction sleep sysconf])
- AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0])
-@@ -1099,8 +1123,8 @@ fi
- 
- AC_ARG_WITH(
-         [module-dir],
--        AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]),
--        [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"])
-+        AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules]),
-+        [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules"])
- 
- AC_SUBST(modlibexecdir)
- 
diff --git a/audio/pulseaudio/patches/patch-bb b/audio/pulseaudio/patches/patch-bb
deleted file mode 100644
index c0a92b934f7..00000000000
--- a/audio/pulseaudio/patches/patch-bb
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
-
---- src/pulsecore/atomic.h.orig	2008-09-03 17:13:44.000000000 -0400
-+++ src/pulsecore/atomic.h	2008-12-23 14:13:35.000000000 -0500
-@@ -107,6 +107,85 @@ static inline pa_bool_t pa_atomic_ptr_cm
-     return __sync_bool_compare_and_swap(&a->value, (long) old_p, (long) new_p);
- }
- 
-+#elif defined(__NetBSD__) && defined(HAVE_SYS_ATOMIC_H)
-+
-+/* NetBSD 5.0+ atomic_ops(3) implementation */
-+
-+#include <sys/atomic.h>
-+
-+typedef struct pa_atomic {
-+    volatile unsigned int value;
-+} pa_atomic_t;
-+
-+#define PA_ATOMIC_INIT(v) { .value = (unsigned int) (v) }
-+
-+static inline int pa_atomic_load(const pa_atomic_t *a) {
-+    membar_sync();
-+    return (int) a->value;
-+}
-+
-+static inline void pa_atomic_store(pa_atomic_t *a, int i) {
-+    a->value = (unsigned int) i;
-+    membar_sync();
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_add(pa_atomic_t *a, int i) {
-+    int nv = (int)atomic_add_int_nv(&a->value, i);
-+    return nv - i;
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_sub(pa_atomic_t *a, int i) {
-+    int nv = (int)atomic_add_int_nv(&a->value, -i);
-+    return nv + i;
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_inc(pa_atomic_t *a) {
-+    int nv = (int)atomic_inc_uint_nv(&a->value);
-+    return nv - 1;
-+}
-+
-+/* Returns the previously set value */
-+static inline int pa_atomic_dec(pa_atomic_t *a) {
-+    int nv = (int)atomic_dec_uint_nv(&a->value);
-+    return nv + 1;
-+}
-+
-+/* Returns TRUE when the operation was successful. */
-+static inline pa_bool_t pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int new_i) {
-+    unsigned int r = atomic_cas_uint(&a->value, (unsigned int) old_i, (unsigned int) new_i);
-+    if ((int) r == old_i)
-+	return TRUE;
-+    else
-+	return FALSE;
-+}
-+
-+typedef struct pa_atomic_ptr {
-+    volatile void *value;
-+} pa_atomic_ptr_t;
-+
-+#define PA_ATOMIC_PTR_INIT(v) { .value = (v) }
-+
-+static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
-+    membar_sync();
-+    return (void *) a->value;
-+}
-+
-+static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void *p) {
-+    a->value = p;
-+    membar_sync();
-+}
-+
-+static inline pa_bool_t pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void* new_p) {
-+    void *r = atomic_cas_ptr(&a->value, old_p, new_p);
-+    if (r == old_p)
-+	return TRUE;
-+    else
-+	return FALSE;
-+}
-+
- #elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
- 
- #warn "The native atomic operations implementation for AMD64 has not been tested thoroughly. libatomic_ops is known to not work properly on AMD64 and your gcc version is too old for the gcc-builtin atomic ops support. You have three options now: test the native atomic operations implementation for AMD64, fix libatomic_ops, or upgrade your GCC."