Update to 5.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19226 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 21 insertions, 94 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 9422db712..017c66db3 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -6,14 +6,13 @@
 # PORTREVISION bumps of depending ports.
 
 PORTNAME=	pulseaudio
-PORTVERSION=	4.0
+PORTVERSION=	5.0
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound server for UNIX
 
-# keep the json version otherwise it will match json-glib
 LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libspeexdsp.so:${PORTSDIR}/audio/speex \
@@ -25,14 +24,13 @@ LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libck-connector.so:${PORTSDIR}/sysutils/consolekit
 
-USE_XZ=		yes
 USE_GNOME=	glib20 intltool gnomehier
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libltdl
-MAKE_JOBS_UNSAFE=yes
+#MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		OPENSSL_CFLAGS="-I/usr/include" \
@@ -57,7 +55,7 @@ USERS=		pulse
 GROUPS=		pulse pulse-access pulse-rt
 
 OPTIONS_DEFINE=	JACK AVAHI GCONF ALSA SIMD
-OPTIONS_DEFAULT=AVAHI GCONF SIMD
+OPTIONS_DEFAULT=AVAHI SIMD
 
 PULSE_VERSION=	${PORTVERSION}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 544066882..d34149f6d 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pulseaudio-4.0.tar.xz) = 35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae
-SIZE (pulseaudio-4.0.tar.xz) = 1392072
+SHA256 (pulseaudio-5.0.tar.xz) = 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939
+SIZE (pulseaudio-5.0.tar.xz) = 1455428
diff --git a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
index a723999af..4edcb6627 100644
--- a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
+++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
@@ -1,24 +1,26 @@
---- src/modules/oss/module-oss.c.orig	2009-04-13 17:11:32.000000000 -0400
-+++ src/modules/oss/module-oss.c	2009-07-19 14:24:25.000000000 -0400
-@@ -1214,10 +1214,12 @@ int pa__init(pa_module*m) {
-         use_mmap = FALSE;
+--- src/modules/oss/module-oss.c.orig	2014-01-23 19:57:55.000000000 +0100
++++ src/modules/oss/module-oss.c	2014-03-22 10:59:05.000000000 +0100
+@@ -1229,10 +1229,14 @@ int pa__init(pa_module*m) {
+         use_mmap = false;
      }
  
 +#ifndef __FreeBSD__
++/* Disable mmap. The OSS on FreeBSD doesn't support read & write on 
++   the same socket */
      if (use_mmap && mode == O_WRONLY) {
          pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
-         use_mmap = FALSE;
+         use_mmap = false;
      }
 +#endif
  
      if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
          pa_log_info("Hardware name is '%s'.", hwdesc);
-@@ -1399,7 +1401,7 @@ int pa__init(pa_module*m) {
+@@ -1428,7 +1432,7 @@ int pa__init(pa_module*m) {
      if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
-         pa_bool_t do_close = TRUE;
+         bool do_close = true;
  
 -        if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
 +        if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
              pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
- 
          else {
+             if (u->sink && (u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM))) {
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
deleted file mode 100644
index b242e2e41..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/pulsecore/pstream.c.orig	2007-10-28 15:13:53.000000000 -0400
-+++ src/pulsecore/pstream.c	2008-01-01 16:14:18.000000000 -0500
-@@ -183,14 +183,17 @@ static void do_something(pa_pstream *p) 
-     p->mainloop->defer_enable(p->defer_event, 0);
- 
-     if (!p->dead && pa_iochannel_is_readable(p->io)) {
--        if (do_read(p) < 0)
-+        if (do_read(p) < 0) {
-             goto fail;
--    } else if (!p->dead && pa_iochannel_is_hungup(p->io))
-+	}
-+    } else if (!p->dead && pa_iochannel_is_hungup(p->io)) {
-         goto fail;
-+    }
- 
-     if (!p->dead && pa_iochannel_is_writable(p->io)) {
--        if (do_write(p) < 0)
-+        if (do_write(p) < 0) {
-             goto fail;
-+	}
-     }
- 
-     pa_pstream_unref(p);
diff --git a/audio/pulseaudio/files/patch-src_tests_once-test.c b/audio/pulseaudio/files/patch-src_tests_once-test.c
deleted file mode 100644
index 00b6e9522..000000000
--- a/audio/pulseaudio/files/patch-src_tests_once-test.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/tests/once-test.c.orig	2011-10-20 14:54:17.000000000 +0200
-+++ src/tests/once-test.c	2011-10-21 12:52:15.000000000 +0200
-@@ -23,6 +23,11 @@
- 
- #ifdef HAVE_PTHREAD
- #include <pthread.h>
-+#ifdef HAVE_PTHREAD_SETAFFINITY_NP 
-+#include <pthread_np.h>
-+#include <sys/param.h>
-+#include <sys/cpuset.h> 
-+#endif
- #endif
- 
- #include <pulsecore/thread.h>
-@@ -54,7 +59,11 @@
- 
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
-     static pa_atomic_t i_cpu = PA_ATOMIC_INIT(0);
-+#ifdef __FreeBSD__
-+    cpuset_t mask;
-+#else
-     cpu_set_t mask;
-+#endif
- 
-     CPU_ZERO(&mask);
-     CPU_SET((size_t) (pa_atomic_inc(&i_cpu) % n_cpu), &mask);
diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
deleted file mode 100644
index 9fa1ea5e6..000000000
--- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/tests/rtstutter.c.orig	2011-10-20 14:54:17.000000000 +0200
-+++ src/tests/rtstutter.c	2011-10-21 12:52:31.000000000 +0200
-@@ -30,6 +30,11 @@
- 
- #ifdef HAVE_PTHREAD
- #include <pthread.h>
-+#ifdef HAVE_PTHREAD_SETAFFINITY_NP 
-+#include <pthread_np.h>
-+#include <sys/param.h>
-+#include <sys/cpuset.h> 
-+#endif
- #endif
- 
- #include <pulse/util.h>
-@@ -54,7 +59,11 @@
- 
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
- {
-+#ifdef __FreeBSD__
-+    cpuset_t mask;
-+#else
-     cpu_set_t mask;
-+#endif
- 
-     CPU_ZERO(&mask);
-     CPU_SET((size_t) PA_PTR_TO_UINT(p), &mask);
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 8e6a50f72..bb9fcdd43 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -64,15 +64,15 @@ lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
 lib/libpulse-mainloop-glib.la
 lib/libpulse-mainloop-glib.so
 lib/libpulse-mainloop-glib.so.0
-lib/libpulse-mainloop-glib.so.0.0.4
+lib/libpulse-mainloop-glib.so.0.0.5
 lib/libpulse-simple.la
 lib/libpulse-simple.so
 lib/libpulse-simple.so.0
-lib/libpulse-simple.so.0.0.4
+lib/libpulse-simple.so.0.1.0
 lib/libpulse.la
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulse.so.0.16.2
+lib/libpulse.so.0.17.3
 lib/libpulsecore-%%PULSE_VERSION%%.la
 lib/libpulsecore-%%PULSE_VERSION%%.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
@@ -149,7 +149,9 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-port-available.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink-new.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source-new.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.so