The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.

Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have
ported a few that can't be installed via this way.
The old gnome-utils and gnome-games ports where split up into single ports
and where converted to meta-ports.
gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but
if you use startx you need to do this yourself.

Upgrade instructions:

Delete the old and conflicting packages:
# pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \
    guile gcalctool gnome-media libgnomekbd
# pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \
    evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center

For package users the following lines will be enough:
# pkg upgrade
# pkg install gnome3

For ports users should do the following:
# portmaster -a
# portmaster x11/gnome3

We are currently aware of two issues. The first issue is a bug in the
file monitoring code in the glib20 port. This bug causes glib programs
to crash when files in a monitored directory are added or removed.
Upstream is aware of the problem, but since the problem is quite complex
there is no solution yet. This problem isn't restricted to BSD.

The second issue is that on certain video cards totem will display a
purple/pink overlay on the video. It not clear yet where the issues
comes from.

Major thanks goes to Gustau Perez for being a driving force behind getting
GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs.

This update was also made possible by:
	Joe Maloney
	Kris Moore
	Beeblebrox
	Ryan Lortie
	Antoine Jacoutot
	and everyone I missed

18 files changed, 171 insertions, 358 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index f467ebb1a88c..ef2d7fd52e3a 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,15 +1,13 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.7 2010/06/25 20:35:01 kwm Exp $
-
-# !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
-# PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon,
-# and audio/gstreamer-plugins-pulse.
+#   $MCom: ports/trunk/audio/pulseaudio/Makefile 20031 2014-11-02 21:47:55Z kwm $
 #
+# !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
+# PORTREVISION bumps of depending ports.
 
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.23
-PORTREVISION=	3
+PORTVERSION=	5.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
@@ -19,86 +17,62 @@ COMMENT=	Sound server for UNIX
 LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libspeexdsp.so:${PORTSDIR}/audio/speex \
+		libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
+		liborc-0.4.so:${PORTSDIR}/devel/orc \
+		libjson-c.so:${PORTSDIR}/devel/json-c \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libgdbm.so:${PORTSDIR}/databases/gdbm \
 		libck-connector.so:${PORTSDIR}/sysutils/consolekit
 
 USE_GNOME=	glib20 intltool
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USES=		execinfo gettext gmake libtool pathfix pkgconfig
+USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lcrypto -lssl" \
-		ac_cv_header_linux_input_h=
+		LIBS="-lm -lintl" \
+		ac_cv_header_linux_input_h=""
 CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lm -lintl
+LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-.if ${CC} == clang
-CFLAGS+=	-fheinous-gnu-extensions
-.endif
-
 CONFIGURE_ARGS=	--localstatedir=/var \
-		--with-database=gdbm \
+		--with-database=simple \
 		--without-caps \
-		--disable-alsa \
 		--disable-udev \
-		--disable-gtk2 \
+		--disable-gtk3 \
+		--disable-systemd \
+		--disable-neon-opt \
 		--disable-lirc # untested
 
+#FIXME --with-database=auto|tdb|gdbm|simple
+
 USERS=		pulse
 GROUPS=		pulse pulse-access pulse-rt
 
-OPTIONS_DEFINE=	JACK AVAHI HAL GCONF
-OPTIONS_DEFAULT=	AVAHI HAL GCONF
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	JACK AVAHI GCONF ALSA SIMD
+OPTIONS_DEFAULT=AVAHI SIMD
+JACK_CONFIGURE_ENABLE=	jack
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+AVAHI_CONFIGURE_ENABLE=	avahi
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+GCONF_CONFIGURE_ENABLE=	gconf
+GCONF_USE=	GNOME=gconf2
+ALSA_CONFIGURE_ENABLE=	alsa
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+SIMD_CONFIGURE_ENABLE=	orc
+SIMD_LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
 
 PULSE_VERSION=	${PORTVERSION}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
-PLIST_SUB+=	JACK=""
-.else
-PLIST_SUB+=	JACK="@comment "
-CONFIGURE_ARGS+=--disable-jack
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
-PLIST_SUB+=	AVAHI=""
-.else
-CONFIGURE_ARGS+=--disable-avahi
-PLIST_SUB+=	AVAHI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
-PLIST_SUB+=	HAL=""
-.else
-CONFIGURE_ARGS+=--disable-hal
-PLIST_SUB+=	HAL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=	gconf2
-PLIST_SUB+=	GCONF=""
-.else
-CONFIGURE_ARGS+=--disable-gconf
-PLIST_SUB+=	GCONF="@comment "
-.endif
-
-.if ((${OSVERSION} >= 800000) && (${OSVERSION} < 802504)) || \
-	((${OSVERSION} >= 900000) && (${OSVERSION} < 900037))
-EXTRA_PATCHES+=	${FILESDIR}/extra-src_modules_oss_module-oss.c
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/daemon/default.pa.in
@@ -109,7 +83,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse
 .for ii in default.pa daemon.conf client.conf system.pa
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
-		${STAGEDIR}${PREFIX}/etc/pulse/${ii}-dist
+		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index f445b8ea82e0..d34149f6dd97 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pulseaudio-0.9.23.tar.gz) = af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e
-SIZE (pulseaudio-0.9.23.tar.gz) = 2095454
+SHA256 (pulseaudio-5.0.tar.xz) = 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939
+SIZE (pulseaudio-5.0.tar.xz) = 1455428
diff --git a/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c b/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c
deleted file mode 100644
index f16573727007..000000000000
--- a/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/oss/module-oss.c.orig	2010-11-26 01:45:23.000000000 +0100
-+++ src/modules/oss/module-oss.c	2011-03-11 10:14:04.000000000 +0100
-@@ -1164,7 +1164,7 @@ int pa__init(pa_module*m) {
-     int fd = -1;
-     int nfrags, orig_frag_size, frag_size;
-     int mode, caps;
--    pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE;
-+    pa_bool_t record = TRUE, playback = TRUE, use_mmap = FALSE;
-     pa_sample_spec ss;
-     pa_channel_map map;
-     pa_modargs *ma = NULL;
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
deleted file mode 100644
index 525356e4b0b5..000000000000
--- a/audio/pulseaudio/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	2010-11-27 12:59:51.000000000 -0500
-+++ configure	2010-11-27 13:00:33.000000000 -0500
-@@ -13773,6 +13773,7 @@ $as_echo_n "checking whether to check fo
-    check_inconsistencies=yes
-    case "${host_cpu}-${host_os}" in
-      *-darwin*) check_inconsistencies=no ;;
-+     *-freebsd*) check_inconsistencies=no ;;
-    esac
-    if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -18300,7 +18301,7 @@ _ACEOF
- 
- else
- 
--   as_fn_error $? "*** libatomic-ops headers not found" "$LINENO" 5
-+#   as_fn_error $? "*** libatomic-ops headers not found" "$LINENO" 5
- 
- fi
- 
-@@ -18308,9 +18309,9 @@ done
- 
- 
-    # Win32 does not need the lib and breaks horribly if we try to include it
--   if test "x$os_is_win32" != "x1" ; then
--       LIBS="$LIBS -latomic_ops"
--   fi
-+#   if test "x$os_is_win32" != "x1" ; then
-+#       LIBS="$LIBS -latomic_ops"
-+#   fi
- else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in
index a4a6231f5ed9..e8503dd85719 100644
--- a/audio/pulseaudio/files/patch-src_Makefile.in
+++ b/audio/pulseaudio/files/patch-src_Makefile.in
@@ -1,23 +1,11 @@
---- src/Makefile.in.orig	2010-06-25 21:42:58.000000000 +0200
-+++ src/Makefile.in	2010-06-25 21:52:27.000000000 +0200
-@@ -2914,7 +2914,7 @@
- libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \
- 	-avoid-version $(am__append_14)
- libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \
--	$(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
-+	$(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) -lexecinfo \
- 	$(LIBSNDFILE_LIBS) $(am__append_16) $(am__append_20)
- 
- ###################################
-@@ -7778,9 +7778,8 @@
- 
+--- src/Makefile.in.orig	2012-06-08 11:09:45.000000000 +0200
++++ src/Makefile.in	2012-06-08 11:10:00.000000000 +0200
+@@ -8531,7 +8531,7 @@
  info-am:
  
--install-data-am: install-alsapathsDATA install-alsaprofilesetsDATA \
--	install-dbuspolicyDATA install-pulseconfDATA \
--	install-pulseincludeHEADERS install-udevrulesDATA \
-+install-data-am: install-dbuspolicyDATA  \
-+	install-pulseincludeHEADERS  \
- 	install-xdgautostartDATA
+ install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \
+-	install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \
++	install-dist_alsaprofilesetsDATA \
+ 	install-padsplibLTLIBRARIES install-pulseconfDATA \
+ 	install-pulseincludeHEADERS install-xdgautostartDATA
  
- install-dvi: install-dvi-am
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
index 0ca5a64e5ba6..b6e714e60174 100644
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -1,17 +1,17 @@
---- src/daemon/default.pa.in.orig	2009-07-19 14:58:14.000000000 -0400
-+++ src/daemon/default.pa.in	2009-07-19 14:58:41.000000000 -0400
-@@ -22,10 +22,10 @@
- .nofail
- 
- ### Load something into the sample cache
+--- src/daemon/default.pa.in.orig	2011-10-21 15:14:14.000000000 +0200
++++ src/daemon/default.pa.in	2011-10-21 15:15:21.000000000 +0200
+@@ -27,10 +27,10 @@
+ load-sample x11-bell %WINDIR%\Media\ding.wav
+ load-sample-dir-lazy %WINDIR%\Media\*.wav
+ ], [dnl
 -#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
 -#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
 -#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
 -#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
-+#load-sample-lazy x11-bell %%LOCALBASE%%/sounds/gtk-events/activate.wav
-+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/sounds/startup3.wav
-+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/sounds/startup3.wav
-+#load-sample-lazy pulse-access %%LOCALBASE%%/sounds/generic.wav
++#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav
++#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/startup3.wav
++#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/startup3.wav
++#load-sample-lazy pulse-access %%LOCALBASE/share/sounds/generic.wav
+ ])dnl
  
  .fail
- 
diff --git a/audio/pulseaudio/files/patch-src_modules_module-cli.c b/audio/pulseaudio/files/patch-src_modules_module-cli.c
deleted file mode 100644
index 4b0fedcc8878..000000000000
--- a/audio/pulseaudio/files/patch-src_modules_module-cli.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/modules/module-cli.c.orig	2009-09-19 13:57:53.000000000 -0400
-+++ src/modules/module-cli.c	2009-09-19 14:04:25.000000000 -0400
-@@ -105,7 +105,12 @@ 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. */
- 
-+#ifdef O_CLOEXEC
-     if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) {
-+#else
-+    if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0 &&
-+        fcntl(fd, F_SETFD, FD_CLOEXEC) != -1) {
-+#endif
-         io = pa_iochannel_new(m->core->mainloop, fd, fd);
-         pa_log_debug("Managed to open /dev/tty.");
-     } else {
diff --git a/audio/pulseaudio/files/patch-src_modules_module-detect.c b/audio/pulseaudio/files/patch-src_modules_module-detect.c
index 0d13b281e846..e538ea0e80a3 100644
--- a/audio/pulseaudio/files/patch-src_modules_module-detect.c
+++ b/audio/pulseaudio/files/patch-src_modules_module-detect.c
@@ -1,6 +1,16 @@
---- src/modules/module-detect.c.orig	2009-11-22 22:57:05.000000000 -0500
-+++ src/modules/module-detect.c	2010-06-17 19:20:39.000000000 -0400
-@@ -161,8 +161,7 @@
+--- src/modules/module-detect.c.orig	2010-11-26 01:45:43.000000000 +0100
++++ src/modules/module-detect.c	2011-03-03 00:35:10.000000000 +0100
+@@ -50,7 +50,9 @@ PA_MODULE_DESCRIPTION("Detect available 
+ PA_MODULE_VERSION(PACKAGE_VERSION);
+ PA_MODULE_LOAD_ONCE(TRUE);
+ PA_MODULE_USAGE("just-one=<boolean>");
++#ifdef __linux__
+ PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-detect!");
++#endif
+ 
+ static const char* const valid_modargs[] = {
+     "just-one",
+@@ -161,8 +163,7 @@ static int detect_oss(pa_core *c, int ju
                  continue;
  
          } else if (sscanf(line, "pcm%u: ", &device) == 1) {
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 a723999af7fd..4edcb6627c96 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_modules_rtp_rtsp_client.c b/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c
deleted file mode 100644
index 2dbcad26ab0d..000000000000
--- a/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/modules/rtp/rtsp_client.c.orig	2009-07-19 14:38:38.000000000 -0400
-+++ src/modules/rtp/rtsp_client.c	2009-07-19 14:39:46.000000000 -0400
-@@ -23,6 +23,9 @@
- #include <config.h>
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_cpu-arm.c b/audio/pulseaudio/files/patch-src_pulsecore_cpu-arm.c
deleted file mode 100644
index 4e7d9a8fe616..000000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_cpu-arm.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/pulsecore/cpu-arm.c.orig	2011-06-23 20:18:54.443125000 +0000
-+++ src/pulsecore/cpu-arm.c	2013-03-09 23:00:50.000000000 +0000
-@@ -82,10 +82,10 @@
- 
- void pa_cpu_init_arm (void) {
- #if defined (__arm__)
-+    pa_cpu_arm_flag_t flags = 0;
- #if defined (__linux__)
-     char *cpuinfo, *line;
-     int arch;
--    pa_cpu_arm_flag_t flags = 0;
- 
-     /* We need to read the CPU flags from /proc/cpuinfo because there is no user
-      * space support to get the CPU features. This only works on linux AFAIK. */
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 b242e2e416da..000000000000
--- 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_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
index 4dfa3a3a9392..85030b5ea4f5 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
@@ -1,20 +1,11 @@
---- src/pulsecore/shm.c.orig	2009-08-19 10:17:06.000000000 +0800
-+++ src/pulsecore/shm.c	2009-11-11 21:25:03.000000000 +0800
-@@ -91,7 +91,7 @@
- #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker))
+--- src/pulsecore/shm.c.orig	2013-04-14 06:42:35.000000000 +0200
++++ src/pulsecore/shm.c	2013-06-24 17:25:58.000000000 +0200
+@@ -97,7 +97,7 @@ struct shm_marker {
  
+ #ifdef HAVE_SHM_OPEN
  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 @@
-         pa_random(&m->id, sizeof(m->id));
-         segment_name(fn, sizeof(fn), m->id);
- 
--        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
-+        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) {
-             pa_log("shm_open() failed: %s", pa_cstrerror(errno));
-             goto fail;
-         }
+ #endif
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c b/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c
deleted file mode 100644
index 99d2f5d37135..000000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/pulsecore/svolume_mmx.c.orig	2011-06-23 20:18:54.484125000 +0000
-+++ src/pulsecore/svolume_mmx.c	2013-04-18 09:22:42.000000000 +0000
-@@ -154,9 +154,9 @@
-         "6:                             \n\t"
-         " emms                          \n\t"
- 
--        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
-+        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- #if defined (__i386__)
--        : "m" ((pa_reg_x86)channels)
-+        : "m" (channels)
- #else
-         : "r" ((pa_reg_x86)channels)
- #endif
-@@ -235,9 +235,9 @@
-         "6:                             \n\t"
-         " emms                          \n\t"
- 
--        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
-+        : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- #if defined (__i386__)
--        : "m" ((pa_reg_x86)channels)
-+        : "m" (channels)
- #else
-         : "r" ((pa_reg_x86)channels)
- #endif
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c b/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c
deleted file mode 100644
index 420389c4e43e..000000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pulsecore/svolume_sse.c.orig	2013-04-19 14:02:51.000000000 +0000
-+++ src/pulsecore/svolume_sse.c	2013-04-19 14:03:14.000000000 +0000
-@@ -155,7 +155,7 @@
- 
-         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- #if defined (__i386__)
--        : "m" ((pa_reg_x86)channels)
-+        : "m" (channels)
- #else
-         : "r" ((pa_reg_x86)channels)
- #endif
-@@ -249,7 +249,7 @@
- 
-         : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- #if defined (__i386__)
--        : "m" ((pa_reg_x86)channels)
-+        : "m" (channels)
- #else
-         : "r" ((pa_reg_x86)channels)
- #endif
diff --git a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c b/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c
deleted file mode 100644
index 365ca8d2bec7..000000000000
--- a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/tests/rtpoll-test.c.orig	2008-01-03 20:03:03.000000000 -0500
-+++ src/tests/rtpoll-test.c	2008-01-03 20:03:25.000000000 -0500
-@@ -45,6 +45,7 @@ static int worker(pa_rtpoll_item *w) {
- }
- 
- int main(int argc, char *argv[]) {
-+#ifdef SIGRTMIN
-     pa_rtpoll *p;
-     pa_rtpoll_item *i, *w;
-     struct pollfd *pollfd;
-@@ -86,6 +87,7 @@ int main(int argc, char *argv[]) {
-     pa_rtpoll_item_free(w);
- 
-     pa_rtpoll_free(p);
-+#endif
- 
-     return 0;
- }
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 c80737b1946f..000000000000
--- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/tests/rtstutter.c.orig	2009-07-23 15:40:47.000000000 +0200
-+++ src/tests/rtstutter.c	2009-11-24 16:26:36.000000000 +0100
-@@ -31,6 +31,11 @@
- #include <string.h>
- #include <pthread.h>
- 
-+#ifdef HAVE_PTHREAD_SETAFFINITY_NP 
-+#include <sys/param.h>
-+#include <sys/cpuset.h> 
-+#endif
-+
- #include <pulse/timeval.h>
- #include <pulse/gccmacro.h>
- 
-@@ -44,8 +49,12 @@
- 
- static void* work(void *p) {
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
-+#ifdef __FreeBSD__
-+    cpuset_t mask;
-+#else
-     cpu_set_t mask;
- #endif
-+#endif
-     struct sched_param param;
- 
-     pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p));
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 1253246bf1ff..77cd1fa4da5c 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -1,5 +1,4 @@
 bin/esdcompat
-%%AVAHI%%bin/pabrowse
 bin/pacat
 bin/pacmd
 bin/pactl
@@ -11,31 +10,26 @@ bin/parecord
 bin/pasuspender
 bin/pax11publish
 bin/pulseaudio
+bin/qpaeq
 bin/start-pulseaudio-kde
 bin/start-pulseaudio-x11
+etc/bash_completion.d/pulseaudio-bash-completion.sh
 etc/dbus-1/system.d/pulseaudio-system.conf
-@unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
-etc/pulse/client.conf-dist
-@exec [ -f %B/client.conf ] || cp %B/%f %B/client.conf
-@unexec if cmp -s %D/etc/pulse/daemon.conf %D/etc/pulse/daemon.conf-dist; then rm -f %D/etc/pulse/daemon.conf; fi
-etc/pulse/daemon.conf-dist
-@exec [ -f %B/daemon.conf ] || cp %B/%f %B/daemon.conf
-@unexec if cmp -s %D/etc/pulse/default.pa %D/etc/pulse/default.pa-dist; then rm -f %D/etc/pulse/default.pa; fi
-etc/pulse/default.pa-dist
-@exec [ -f %B/default.pa ] || cp %B/%f %B/default.pa
-@unexec if cmp -s %D/etc/pulse/system.pa %D/etc/pulse/system.pa-dist; then rm -f %D/etc/pulse/system.pa; fi
-etc/pulse/system.pa-dist
-@exec [ -f %B/system.pa ] || cp %B/%f %B/system.pa
+@sample etc/pulse/client.conf.sample
+@sample etc/pulse/daemon.conf.sample
+@sample etc/pulse/default.pa.sample
+@sample etc/pulse/system.pa.sample
 etc/xdg/autostart/pulseaudio.desktop
 etc/xdg/autostart/pulseaudio-kde.desktop
-%%AVAHI%%include/pulse/browser.h
 include/pulse/cdecl.h
 include/pulse/channelmap.h
 include/pulse/context.h
 include/pulse/def.h
 include/pulse/error.h
 include/pulse/ext-device-manager.h
+include/pulse/ext-device-restore.h
 include/pulse/ext-stream-restore.h
+include/pulse/format.h
 include/pulse/gccmacro.h
 include/pulse/glib-mainloop.h
 include/pulse/introspect.h
@@ -58,23 +52,21 @@ include/pulse/util.h
 include/pulse/version.h
 include/pulse/volume.h
 include/pulse/xmalloc.h
-%%AVAHI%%lib/libpulse-browse.so
-%%AVAHI%%lib/libpulse-browse.so.0
-%%AVAHI%%lib/libpulse-browse.so.0.1.1
+lib/cmake/PulseAudio/PulseAudioConfig.cmake
+lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
 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.so
 lib/libpulse-simple.so.0
-lib/libpulse-simple.so.0.0.3
+lib/libpulse-simple.so.0.1.0
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulse.so.0.12.4
-lib/libpulsecommon-%%PULSE_VERSION%%.so
+lib/libpulse.so.0.17.3
 lib/libpulsecore-%%PULSE_VERSION%%.so
-lib/libpulsedsp.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
+%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
 lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
@@ -84,6 +76,9 @@ lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
 lib/pulse-%%PULSE_VERSION%%/modules/libraop.so
 lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
+%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-card.so
+%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.so
+%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so
@@ -91,22 +86,26 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-combine-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-dbus-protocol.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-equalizer-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-filter-apply.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.so
 %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so
+%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jackdbus-detect.so
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.so
@@ -116,6 +115,7 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-null-source.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
@@ -123,7 +123,10 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-remap-source.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-role-cork.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-role-ducking.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-rygel-media-server.so
@@ -133,8 +136,15 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.so
 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
+lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so
@@ -142,13 +152,13 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
-%%AVAHI%%libdata/pkgconfig/libpulse-browse.pc
+lib/pulseaudio/libpulsecommon-%%PULSE_VERSION%%.so
+lib/pulseaudio/libpulsedsp.so
 libdata/pkgconfig/libpulse-mainloop-glib.pc
 libdata/pkgconfig/libpulse-simple.pc
 libdata/pkgconfig/libpulse.pc
 %%GCONF%%libexec/pulse/gconf-helper
 man/man1/esdcompat.1.gz
-man/man1/pabrowse.1.gz
 man/man1/pacat.1.gz
 man/man1/pacmd.1.gz
 man/man1/pactl.1.gz
@@ -157,9 +167,56 @@ man/man1/paplay.1.gz
 man/man1/pasuspender.1.gz
 man/man1/pax11publish.1.gz
 man/man1/pulseaudio.1.gz
+man/man1/start-pulseaudio-kde.1.gz
+man/man1/start-pulseaudio-x11.1.gz
 man/man5/default.pa.5.gz
+man/man5/pulse-cli-syntax.5.gz
 man/man5/pulse-client.conf.5.gz
 man/man5/pulse-daemon.conf.5.gz
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-front-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-headphone-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-headset-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic-always.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-rear-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-video.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input.conf.common
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-desktop-speaker.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-lineout.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-speaker-always.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf.common
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-0.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-1.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-2.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-3.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/extra-hdmi.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/maudio-fasttrack-pro.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-korecontroller.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio10.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio2.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf
+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
 share/locale/as/LC_MESSAGES/pulseaudio.mo
 share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
 share/locale/ca/LC_MESSAGES/pulseaudio.mo
@@ -171,8 +228,10 @@ share/locale/es/LC_MESSAGES/pulseaudio.mo
 share/locale/fi/LC_MESSAGES/pulseaudio.mo
 share/locale/fr/LC_MESSAGES/pulseaudio.mo
 share/locale/gu/LC_MESSAGES/pulseaudio.mo
+share/locale/he/LC_MESSAGES/pulseaudio.mo
 share/locale/hi/LC_MESSAGES/pulseaudio.mo
 share/locale/hu/LC_MESSAGES/pulseaudio.mo
+share/locale/id/LC_MESSAGES/pulseaudio.mo
 share/locale/it/LC_MESSAGES/pulseaudio.mo
 share/locale/ja/LC_MESSAGES/pulseaudio.mo
 share/locale/kn/LC_MESSAGES/pulseaudio.mo
@@ -184,6 +243,7 @@ share/locale/pa/LC_MESSAGES/pulseaudio.mo
 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/sr/LC_MESSAGES/pulseaudio.mo
 share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
 share/locale/sv/LC_MESSAGES/pulseaudio.mo
@@ -191,22 +251,8 @@ share/locale/ta/LC_MESSAGES/pulseaudio.mo
 share/locale/te/LC_MESSAGES/pulseaudio.mo
 share/locale/uk/LC_MESSAGES/pulseaudio.mo
 share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
-share/vala/vapi/libpulse.deps
-share/vala/vapi/libpulse.vapi
+share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
 share/vala/vapi/libpulse-mainloop-glib.deps
 share/vala/vapi/libpulse-mainloop-glib.vapi
-%%GCONF%%@dirrm libexec/pulse
-@dirrm lib/pulse-%%PULSE_VERSION%%/modules
-@dirrm lib/pulse-%%PULSE_VERSION%%
-@dirrm include/pulse
-@dirrm etc/pulse
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/de_CH/LC_MESSAGES
-@dirrmtry share/locale/de_CH
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
+share/vala/vapi/libpulse.deps
+share/vala/vapi/libpulse.vapi