Sat May 21 15:33:00 2011 UTC ()

Add comments to most patches.
Also add a patch by drochner:
pthread_key_create returns 0 on success; return values on failure are
not defined.

Remaining patches without comments:
patch-ab: adding an ifdef notyet in src/daemon/main.c
patch-a{c,e}: --start -> -D (no idea why)
patch-af: allow some Linux-only code also on NetBSD


(wiz)

--- pkgsrc/audio/pulseaudio/distinfo 2011/01/20 13:08:59 1.24
+++ pkgsrc/audio/pulseaudio/distinfo 2011/05/21 15:32:59 1.25

 @@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.24 2011/01/20 13:08:59 ahoka Exp $
+$NetBSD: distinfo,v 1.25 2011/05/21 15:32:59 wiz Exp $
 SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
 Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes
-SHA1 (patch-aa) = 078dd540b56f2db5d676835ab37cd4e8bbe33650
+SHA1 (patch-aa) = b8d6bf8ce8642bc987a7dce5d14df51a2a92d2ae
 SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f
 SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0
-SHA1 (patch-ad) = 5c7b5254233c8e0d36c6659454af0780af872cc3
+SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442
 SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30
 SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e
-SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a
+SHA1 (patch-ag) = 64c93717f864605ba66cc6c4be84a594aeda943c
-SHA1 (patch-ah) = 8327883adcbc679fdb97de9a0f10a89438ea9fd7
+SHA1 (patch-ah) = b4ce6535ca9dfc695bd04c5fae0a5bc614bec2eb
-SHA1 (patch-ba) = 3e5f28049363676d4bf3061605529253bea24f25
+SHA1 (patch-ba) = 7a57cbd68026c72804bb705d2a23e562c59b86a7
 SHA1 (patch-bb) = e6f4095eb460c605b8dcc02980c5cff0cd0715a8
-SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171
+SHA1 (patch-ca) = 14ea426afebad99b53e6f8d594ff2f5adac07e30
-SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20
+SHA1 (patch-da) = 3d63c7a2e76e41b9400869badda0d0e008c4b9bc
-SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864
+SHA1 (patch-db) = 1bd6b5c35a38476de4bfdb606b5ecf8243ddf91f
-SHA1 (patch-dc) = d814e1a1d5aed3e3604d6df44621fe789c625982
+SHA1 (patch-dc) = fe5f8e6eec89ec832d9d161fa0a201e64a841a0c
-SHA1 (patch-dd) = 83e51035ff871cef9c39bf670173e30705df8fe5
+SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f
-SHA1 (patch-poll_c-build-fix) = 4250be8c4a1f2dbe6ca3621b285d11258b34a62b
+SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8
 SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-aa 2010/02/01 15:00:20 1.6
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-aa 2011/05/21 15:32:59 1.7

 @@ -1,14 +1,20 @@
-$NetBSD: patch-aa,v 1.6 2010/02/01 15:00:20 jmcneill Exp $
+$NetBSD: patch-aa,v 1.7 2011/05/21 15:32:59 wiz Exp $
 SNDDSP_GETODELAY isn't defined on NetBSD-4.x.
 ioctl() takes u_long argument on NetBSD.
 On NetBSD, use third parameter in ioctl instead of varargs.
 stat() system call has been versioned, use latest version when dlopen()ing.
 Try more typical device names.
 --- src/utils/padsp.c.orig	2009-09-18 20:21:44.000000000 +0000
 +++ src/utils/padsp.c
 @@ -60,6 +60,10 @@
  # define SIOCINQ FIONREAD
  #endif
 +#if !defined(SNDCTL_DSP_GETODELAY)
 +# define SNDCTL_DSP_GETODELAY _IOR ('P', 23, int)
 +#endif
++
  /* make sure gcc doesn't redefine open and friends as macros */
  #undef open

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-ad 2010/12/02 21:17:43 1.6
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-ad 2011/05/21 15:32:59 1.7

 @@ -1,14 +1,20 @@
-$NetBSD: patch-ad,v 1.6 2010/12/02 21:17:43 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2011/05/21 15:32:59 wiz Exp $
 . chunk: adapt installation paths for pkgsrc; make UDEV optional
 . chunk: adapt installation path for pkgsrc
 . chunk: adapt path for NetBSD
 . chunk: link against libossaudio where it exists (variable supplied
 by pkgsrc)
 --- src/Makefile.am.orig	2009-11-22 19:57:04.000000000 -0800
 +++ src/Makefile.am	2010-10-01 10:11:05.000000000 -0700
 @@ -26,13 +26,17 @@
  pulseincludedir=$(includedir)/pulse
  pulsecoreincludedir=$(includedir)/pulsecore
 -pulseconfdir=$(sysconfdir)/pulse
 +pulseconfdir=$(EGDIR)
  pulselibexecdir=$(libexecdir)/pulse
 -xdgautostartdir=$(sysconfdir)/xdg/autostart
 +xdgautostartdir=$(PREFIX)/share/gnome/autostart
  alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-ag 2010/02/01 15:00:20 1.2
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-ag 2011/05/21 15:33:00 1.3

 @@ -1,14 +1,17 @@
-$NetBSD: patch-ag,v 1.2 2010/02/01 15:00:20 jmcneill Exp $
+$NetBSD: patch-ag,v 1.3 2011/05/21 15:33:00 wiz Exp $
 shm_open takes a path on NetBSD; pa_shm_create_rw needs write
 permissions, so +w the shared memory when creating it.
 --- src/pulsecore/shm.c.orig	2010-02-01 14:21:15.000000000 +0000
 +++ src/pulsecore/shm.c
 @@ -91,7 +91,7 @@ struct shm_marker {
  #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker))
  static char *segment_name(char *fn, size_t l, unsigned id) {
 -    pa_snprintf(fn, l, "/pulse-shm-%u", id);
 +    pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id);
      return fn;
+ }
 @@ -142,7 +142,7 @@ int pa_shm_create_rw(pa_shm *m, size_t s

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-ca 2010/02/01 15:00:20 1.2
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-ca 2011/05/21 15:33:00 1.3

 @@ -1,14 +1,16 @@
-$NetBSD: patch-ca,v 1.2 2010/02/01 15:00:20 jmcneill Exp $
+$NetBSD: patch-ca,v 1.3 2011/05/21 15:33:00 wiz Exp $
 Avoid GNUism in iconv usage.
 --- src/pulse/utf8.c.orig	2009-09-10 00:04:58.000000000 +0000
 +++ src/pulse/utf8.c
 @@ -55,6 +55,7 @@
  #ifdef HAVE_ICONV
  #include <iconv.h>
 +#include <langinfo.h>
  #endif
  #include <pulse/xmalloc.h>
 @@ -238,11 +239,11 @@ static char* iconv_simple(const char *st
+ }

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-ah 2010/08/10 05:42:34 1.3
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-ah 2011/05/21 15:33:00 1.4

 @@ -1,14 +1,17 @@
-$NetBSD: patch-ah,v 1.3 2010/08/10 05:42:34 tsutsui Exp $
+$NetBSD: patch-ah,v 1.4 2011/05/21 15:33:00 wiz Exp $
 Fix build on NetBSD/arm:
 Fix wrong placed #else clause against #if defined(__linux__) in cpu-arm.c.
 --- src/pulsecore/cpu-arm.c.orig	2009-11-23 03:57:07.000000000 +0000
 +++ src/pulsecore/cpu-arm.c	2010-08-07 08:14:36.000000000 +0000
 @@ -129,11 +129,11 @@
            (flags & PA_CPU_ARM_EDSP) ? "EDSP " : "",
            (flags & PA_CPU_ARM_NEON) ? "NEON " : "",
            (flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : "");
 -#else /* defined (__linux__) */
 -    pa_log ("ARM cpu features not yet supported on this OS");
 -#endif /* defined (__linux__) */
      if (flags & PA_CPU_ARM_V6)
          pa_volume_func_init_arm (flags);

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-ba 2010/08/10 05:42:34 1.7
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-ba 2011/05/21 15:33:00 1.8

 @@ -1,21 +1,27 @@
-$NetBSD: patch-ba,v 1.7 2010/08/10 05:42:34 tsutsui Exp $
+$NetBSD: patch-ba,v 1.8 2011/05/21 15:33:00 wiz Exp $
 . chunk:
 Check NetBSD's native atomic_ops in configure even in arm case.
 configure checks $host_cpu first, not $host_os on checks for
 native atomic operations.
 (In upstream it seems fixed to see $host_os first but
  it might still have problem around NetBSD version checks)
 . chunk:
 Fix for security vulnerability reported in CVE-2009-1299, taken from here:
 http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee
 Also handle atomic_ops for NetBSD/arm.
 --- configure.ac.orig	2009-11-23 04:06:47.000000000 +0000
 +++ configure.ac	2010-08-07 08:06:57.000000000 +0000
 @@ -220,6 +220,10 @@
                  AC_MSG_RESULT([yes])
                  AC_DEFINE_UNQUOTED(ATOMIC_ARM_LINUX_HELPERS, 1, [special arm linux implementation])
                  need_libatomic_ops=no
 +            elif 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([no])
                 AC_CACHE_CHECK([compiler support for arm inline asm atomic operations],

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-da 2010/02/01 15:00:20 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-da 2011/05/21 15:33:00 1.2

 @@ -1,14 +1,16 @@
-$NetBSD: patch-da,v 1.1 2010/02/01 15:00:20 jmcneill Exp $
+$NetBSD: patch-da,v 1.2 2011/05/21 15:33:00 wiz Exp $
 O_CLOEXEC is done differently on NetBSD (fcntl + FD_CLOEXEC).
 --- src/modules/module-cli.c.orig	2009-11-23 03:57:05.000000000 +0000
 +++ src/modules/module-cli.c
 @@ -105,6 +105,32 @@ int pa__init(pa_module*m) {
       * of log messages, particularly because if stdout and stderr are
       * dup'ed they share the same O_NDELAY, too. */
 +#ifndef O_CLOEXEC
 +    if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0) {
 +	int flags;
 +        if ((flags = fcntl(fd, F_GETFD)) < 0) {
 +	    pa_log_debug("Couldn't get file handle flags");
 +	    close(fd);

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-db 2010/02/01 15:00:20 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-db 2011/05/21 15:33:00 1.2

 @@ -1,14 +1,16 @@
-$NetBSD: patch-db,v 1.1 2010/02/01 15:00:20 jmcneill Exp $
+$NetBSD: patch-db,v 1.2 2011/05/21 15:33:00 wiz Exp $
 Make udev optional.
 --- src/daemon/default.pa.in.orig	2009-11-23 03:57:05.000000000 +0000
 +++ src/daemon/default.pa.in
 @@ -49,8 +49,8 @@ load-module module-augment-properties
  #load-module module-pipe-sink
  ### Automatically load driver modules depending on the hardware available
 -.ifexists module-udev-detect@PA_SOEXT@
 -load-module module-udev-detect
 +.ifexists module-hal-detect@PA_SOEXT@
 +load-module module-hal-detect
  .else
  ### Alternatively use the static hardware detection module (for systems that

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-dc 2010/02/01 15:00:20 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-dc 2011/05/21 15:33:00 1.2

 @@ -1,14 +1,17 @@
-$NetBSD: patch-dc,v 1.1 2010/02/01 15:00:20 jmcneill Exp $
+$NetBSD: patch-dc,v 1.2 2011/05/21 15:33:00 wiz Exp $
 If oss.originating_device hal properly isn't availble, try
 sound.originating_device.
 --- src/modules/module-hal-detect.c.orig	2009-09-10 00:04:58.000000000 +0000
 +++ src/modules/module-hal-detect.c
 @@ -337,6 +337,11 @@ static int hal_device_load_oss(struct us
      /* We store only one entry per card, hence we look for the originating device */
      originating_udi = libhal_device_get_property_string(u->context, udi, "oss.originating_device", &error);
 +    if (dbus_error_is_set(&error) || !originating_udi) {
 +	if (dbus_error_is_set(&error))
 +            dbus_error_free(&error);
 +	originating_udi = libhal_device_get_property_string(u->context, udi, "sound.originating_device", &error);
 +    }
      if (dbus_error_is_set(&error) || !originating_udi)

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-dd 2010/02/02 12:39:14 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-dd 2011/05/21 15:33:00 1.2

 @@ -1,14 +1,16 @@
-$NetBSD: patch-dd,v 1.1 2010/02/02 12:39:14 jmcneill Exp $
+$NetBSD: patch-dd,v 1.2 2011/05/21 15:33:00 wiz Exp $
 Avoid autoreconf from adding a git dependency.
 --- git-version-gen.orig	2010-02-02 06:54:03.000000000 -0500
 +++ git-version-gen	2010-02-02 06:55:16.000000000 -0500
 @@ -74,76 +74,10 @@ case $# in
  esac
  tarball_version_file=$1
 -nl='
 -'
+-
 -# First see if there is a tarball-only version file.
 -# then try "git describe", then default.
 -if test -f $tarball_version_file

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-poll_c-build-fix 2011/01/20 13:08:59 1.1
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-poll_c-build-fix 2011/05/21 15:33:00 1.2

 @@ -1,14 +1,16 @@
-$NetBSD: patch-poll_c-build-fix,v 1.1 2011/01/20 13:08:59 ahoka Exp $
+$NetBSD: patch-poll_c-build-fix,v 1.2 2011/05/21 15:33:00 wiz Exp $
 Fix compilation on platforms without poll().
 --- src/pulsecore/poll.c.orig	2009-03-05 11:28:10.000000000 +0000
 +++ src/pulsecore/poll.c
 @@ -41,11 +41,16 @@
  #include <sys/select.h>
  #endif
 +#ifdef HAVE_SYS_SOCKET_H
 +#include <sys/socket.h>
 +#endif
++
  #include "winsock.h"

$NetBSD: patch-de,v 1.1 2011/05/21 15:33:00 wiz Exp $

pthread_key_create returns 0 on success; return values on failure are
not defined.

--- src/pulsecore/thread-posix.c.orig	2010-06-13 14:15:54.000000000 +0000
+++ src/pulsecore/thread-posix.c
@@ -172,7 +172,7 @@ pa_tls* pa_tls_new(pa_free_cb_t free_cb)
 
     t = pa_xnew(pa_tls, 1);
 
-    if (pthread_key_create(&t->key, free_cb) < 0) {
+    if (pthread_key_create(&t->key, free_cb)) {
         pa_xfree(t);
         return NULL;
     }