Update to 6.0

* Remove obsolete hal option for PLIST.

Changelog:
PulseAudio 6.0 Release Notes
Changes at a Glance

    BlueZ 5 native HSP (headset) support
    BlueZ 5 HFP (hands-free) profile support via oFono
    systemd socket activation support
    Better support for multichannel and 2.1 profiles
    Remap optimisations
    Many minor improvements, bug fixes, and i18n updates

Notes for Application Developers

New function in libpulse: pa_stream_write_ext_free(). The function allows more flexible use of free callbacks than the regular pa_stream_write() function. This is useful if an audio buffer is part of a bigger structure that needs to be freed or unreferenced when the audio buffer is no longer needed.

We now have Vala bindings for libpulse-simple.

7 files changed, 52 insertions, 44 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index d290a1623fd..73809bc4737 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2015/02/06 07:20:14 snj Exp $
+# $NetBSD: Makefile,v 1.95 2015/02/21 23:13:10 ryoon Exp $
 
-DISTNAME=	pulseaudio-5.0
-PKGREVISION=	3
+DISTNAME=	pulseaudio-6.0
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -85,7 +84,7 @@ CONF_FILES+=	${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
 CONF_FILES+=	${EGDIR}/pulseaudio-system.conf \
 		${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
 
-PLIST_VARS+=		bonjour coreaudio evdev hal oss sun
+PLIST_VARS+=		bonjour coreaudio evdev oss sun
 
 .if ${OPSYS} == "SunOS"
 PLIST.sun=		yes
@@ -96,7 +95,6 @@ PLIST.oss=		yes
 PLIST.bonjour=	yes
 PLIST.coreaudio=	yes
 .else
-PLIST.hal=		yes
 PLIST.oss=		yes
 .endif
 
diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST
index 838860df7b9..364b5d0089c 100644
--- a/audio/pulseaudio/PLIST
+++ b/audio/pulseaudio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/06/30 11:00:15 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/02/21 23:13:10 ryoon Exp $
 bin/esdcompat
 bin/pacat
 bin/pacmd
@@ -11,12 +11,12 @@ bin/parecord
 bin/pasuspender
 ${PLIST.x11}bin/pax11publish
 bin/pulseaudio
-${PLIST.x11}bin/start-pulseaudio-kde
 ${PLIST.x11}bin/start-pulseaudio-x11
 include/pulse/cdecl.h
 include/pulse/channelmap.h
 include/pulse/context.h
 include/pulse/def.h
+include/pulse/direction.h
 include/pulse/error.h
 include/pulse/ext-device-manager.h
 include/pulse/ext-device-restore.h
@@ -232,17 +232,23 @@ man/man1/paplay.1
 man/man1/pasuspender.1
 man/man1/pax11publish.1
 man/man1/pulseaudio.1
-man/man1/start-pulseaudio-kde.1
 man/man1/start-pulseaudio-x11.1
 man/man5/default.pa.5
 man/man5/pulse-cli-syntax.5
 man/man5/pulse-client.conf.5
 man/man5/pulse-daemon.conf.5
-share/bash-completion/completions/pulseaudio-bash-completion.sh
+share/bash-completion/completions/pacat
+share/bash-completion/completions/pacmd
+share/bash-completion/completions/pactl
+share/bash-completion/completions/padsp
+share/bash-completion/completions/paplay
+share/bash-completion/completions/parec
+share/bash-completion/completions/parecord
+share/bash-completion/completions/pasuspender
+share/bash-completion/completions/pulseaudio
 share/examples/pulseaudio/client.conf
 share/examples/pulseaudio/daemon.conf
 share/examples/pulseaudio/default.pa
-${PLIST.x11}share/examples/pulseaudio/pulseaudio-kde.desktop
 share/examples/pulseaudio/pulseaudio-system.conf
 ${PLIST.x11}share/examples/pulseaudio/pulseaudio.desktop
 share/examples/pulseaudio/system.pa
@@ -273,16 +279,21 @@ share/locale/pl/LC_MESSAGES/pulseaudio.mo
 share/locale/pt/LC_MESSAGES/pulseaudio.mo
 share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
 share/locale/ru/LC_MESSAGES/pulseaudio.mo
+share/locale/sk/LC_MESSAGES/pulseaudio.mo
 share/locale/sr/LC_MESSAGES/pulseaudio.mo
 share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
 share/locale/sv/LC_MESSAGES/pulseaudio.mo
 share/locale/ta/LC_MESSAGES/pulseaudio.mo
 share/locale/te/LC_MESSAGES/pulseaudio.mo
+share/locale/tr/LC_MESSAGES/pulseaudio.mo
 share/locale/uk/LC_MESSAGES/pulseaudio.mo
 share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
 share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
 share/vala/vapi/libpulse-mainloop-glib.deps
 share/vala/vapi/libpulse-mainloop-glib.vapi
+share/vala/vapi/libpulse-simple.deps
+share/vala/vapi/libpulse-simple.vapi
 share/vala/vapi/libpulse.deps
 share/vala/vapi/libpulse.vapi
+share/zsh/site-functions/_pulseaudio
 @pkgdir share/examples/pulse
diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk
index e48eec8761d..6f4c5263063 100644
--- a/audio/pulseaudio/buildlink3.mk
+++ b/audio/pulseaudio/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.22 2014/06/09 13:08:19 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2015/02/21 23:13:10 ryoon Exp $
 
 BUILDLINK_TREE+=	pulseaudio
 
 .if !defined(PULSEAUDIO_BUILDLINK3_MK)
 PULSEAUDIO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.pulseaudio+=	pulseaudio>=5.0
-BUILDLINK_ABI_DEPENDS.pulseaudio+=	pulseaudio>=5.0
+BUILDLINK_API_DEPENDS.pulseaudio+=	pulseaudio>=6.0
+BUILDLINK_ABI_DEPENDS.pulseaudio+=	pulseaudio>=6.0
 BUILDLINK_PKGSRCDIR.pulseaudio?=	../../audio/pulseaudio
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index e272dc90120..d55555f2068 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.48 2015/01/27 04:04:50 dbj Exp $
+$NetBSD: distinfo,v 1.49 2015/02/21 23:13:10 ryoon Exp $
 
-SHA1 (pulseaudio-5.0.tar.xz) = e420931a0b9cf37331cd06e30ba415046317ab85
-RMD160 (pulseaudio-5.0.tar.xz) = 4ba13e92c58f8ada4542d521131094a55e3b6991
-Size (pulseaudio-5.0.tar.xz) = 1455428 bytes
+SHA1 (pulseaudio-6.0.tar.xz) = 3607d523fb270d9b68463de30f5d9e17957f1088
+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-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
 SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c
 SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a
-SHA1 (patch-src_daemon_main.c) = e87f764d18345056210427bea52bf27f3f2999b6
+SHA1 (patch-src_daemon_main.c) = 8cdabd3c631cc5e7c7f370e364d9511b23f88668
 SHA1 (patch-src_modules_module-detect.c) = 25c803ee2d5addf9dbf522d81bd422dc201d4550
 SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7
-SHA1 (patch-src_modules_rtp_rtp.c) = e6c5675c97c28d3c0166c6a2c4ce714334de25e2
 SHA1 (patch-src_pulsecore_sample-util.h) = b6bd83cfdc1c337453d9a728f07205a2cf0af831
-SHA1 (patch-src_pulsecore_svolume__mmx.c) = 57935e4f44f65f062a3669e8ab2749c08c3c4d84
-SHA1 (patch-src_pulsecore_svolume__sse.c) = 1cf7c9cdf1c97d4b6d50b4a5118cc21ce236edc8
+SHA1 (patch-src_pulsecore_svolume__mmx.c) = c34d153e3bfdb812eb7bd70fa330a9ec674c2dc2
+SHA1 (patch-src_pulsecore_svolume__sse.c) = 47c97c1af947133f2a7b330aed38792bb0e7ef09
 SHA1 (patch-src_tests_mult-s16-test.c) = 3a0fbec804ebefbd88688e84b8d45e0aca597b84
 SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
diff --git a/audio/pulseaudio/patches/patch-src_daemon_main.c b/audio/pulseaudio/patches/patch-src_daemon_main.c
index d1cefe8cc7b..fdf02602b03 100644
--- a/audio/pulseaudio/patches/patch-src_daemon_main.c
+++ b/audio/pulseaudio/patches/patch-src_daemon_main.c
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_daemon_main.c,v 1.1 2014/06/09 13:08:19 ryoon Exp $
+$NetBSD: patch-src_daemon_main.c,v 1.2 2015/02/21 23:13:10 ryoon Exp $
 
 Only display Linux-specific warning on Linux.
 
---- src/daemon/main.c.orig	2014-02-25 14:01:58.000000000 +0000
+--- src/daemon/main.c.orig	2015-02-12 14:10:35.000000000 +0000
 +++ src/daemon/main.c
-@@ -1002,10 +1002,12 @@ int main(int argc, char *argv[]) {
+@@ -997,10 +997,12 @@ int main(int argc, char *argv[]) {
  
      pa_disable_sigpipe();
  
 +#if defined(__linux__)
      if (pa_rtclock_hrtimer())
-         pa_log_info(_("Fresh high-resolution timers available! Bon appetit!"));
+         pa_log_info("Fresh high-resolution timers available! Bon appetit!");
      else
-         pa_log_info(_("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"));
+         pa_log_info("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!");
 +#endif
  
      if (conf->lock_memory) {
diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c
index b0b5c1e7a49..74c5ab51fab 100644
--- a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c
+++ b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c
@@ -1,24 +1,24 @@
-$NetBSD: patch-src_pulsecore_svolume__mmx.c,v 1.3 2014/06/30 11:08:54 jperkin Exp $
+$NetBSD: patch-src_pulsecore_svolume__mmx.c,v 1.4 2015/02/21 23:13:10 ryoon Exp $
 
 Avoid bad register usage on OSX 32-bit.
 
---- src/pulsecore/svolume_mmx.c.orig	2014-02-22 11:03:55.000000000 +0000
+--- src/pulsecore/svolume_mmx.c.orig	2015-02-12 14:10:35.000000000 +0000
 +++ src/pulsecore/svolume_mmx.c
-@@ -34,7 +34,7 @@
+@@ -32,7 +32,7 @@
  
  #include "sample-util.h"
  
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
  /* in s: 2 int16_t samples
   * in v: 2 int32_t volumes, fixed point 16:16
   * out s: contains scaled and clamped int16_t samples.
-@@ -243,7 +243,7 @@ static void pa_volume_s16re_mmx(int16_t 
- #endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
+@@ -241,7 +241,7 @@ static void pa_volume_s16re_mmx(int16_t 
+ #endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
  
  void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) {
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
      if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) {
          pa_log_info("Initialising MMX optimized volume functions.");
  
diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c
index 96f70dbab6a..4495a51f9fd 100644
--- a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c
+++ b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c
@@ -1,24 +1,24 @@
-$NetBSD: patch-src_pulsecore_svolume__sse.c,v 1.3 2014/06/30 11:08:54 jperkin Exp $
+$NetBSD: patch-src_pulsecore_svolume__sse.c,v 1.4 2015/02/21 23:13:10 ryoon Exp $
 
 Avoid bad register usage on OSX 32-bit.
 
---- src/pulsecore/svolume_sse.c.orig	2014-02-22 11:05:30.000000000 +0000
+--- src/pulsecore/svolume_sse.c.orig	2015-02-12 14:10:35.000000000 +0000
 +++ src/pulsecore/svolume_sse.c
-@@ -34,7 +34,7 @@
+@@ -32,7 +32,7 @@
  
  #include "sample-util.h"
  
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
  
  #define VOLUME_32x16(s,v)                  /* .. |   vh  |   vl  | */                   \
        " pxor %%xmm4, %%xmm4          \n\t" /* .. |    0  |    0  | */                   \
-@@ -254,7 +254,7 @@ static void pa_volume_s16re_sse2(int16_t
- #endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
+@@ -252,7 +252,7 @@ static void pa_volume_s16re_sse2(int16_t
+ #endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
  
  void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) {
--#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
+-#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__)
      if (flags & PA_CPU_X86_SSE2) {
          pa_log_info("Initialising SSE2 optimized volume functions.");