Attachment #155328 for bug #198567




# PORTREVISION bumps of depending ports.

PORTNAME=	pulseaudio
PORTVERSION=	6.0
PORTREVISION=	3
CATEGORIES=	audio
MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Sound server for UNIX

LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
		libsndfile.so:${PORTSDIR}/audio/libsndfile \
		libspeexdsp.so:${PORTSDIR}/audio/speexdsp \
		libfftw3.so:${PORTSDIR}/math/fftw3 \
		libfftw3f.so:${PORTSDIR}/math/fftw3-float \

USE_GNOME=	glib20 intltool
USE_XORG=	x11 sm xtst ice
USE_LDCONFIG=	yes
USES=		execinfo gettext gmake libtool pathfix shebangfix \
		pkgconfig tar:xz
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
		OPENSSL_CFLAGS="-I/usr/include" \

LDFLAGS+=	-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip

SHEBANG_FILES=	shell-completion/bash/pulseaudio
SHEBANG_LANG=	bash
bash_CMD=	${SETENV} bash

CONFIGURE_ARGS=	--localstatedir=/var \
		--with-database=simple \
		--without-caps \
		--without-zsh-completion-dir \
		--disable-udev \
		--disable-gtk3 \
		--disable-systemd \

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (pulseaudio-5.0.tar.xz) = 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939	1	SHA256 (pulseaudio-6.0.tar.xz) = b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6
2	SIZE (pulseaudio-5.0.tar.xz) = 1455428	2	SIZE (pulseaudio-6.0.tar.xz) = 1469248




--- src/daemon/default.pa.in.orig	2015-02-12 14:10:35 UTC
+++ src/daemon/default.pa.in
@@ -26,10 +26,10 @@ ifelse(@OS_IS_WIN32@, 1, [dnl
 load-sample x11-bell %WINDIR%\Media\ding.wav
 load-sample-dir-lazy %WINDIR%\Media\*.wav
 ], [dnl
-#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga
-#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga
-#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga
-#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga
+#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/freedesktop/stereo/bell.oga
+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga
+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga
+#load-sample-lazy pulse-access %%LOCALBASE%%/share/sounds/freedesktop/stereo/message.oga
 ])dnl
 
 .fail
@@ -40,7 +40,7 @@ load-module module-stream-restore
 load-module module-card-restore
 
 ### Automatically augment property information from .desktop files
-### stored in /usr/share/application
+### stored in %%LOCALBASE%%/share/application
 load-module module-augment-properties
 
 ### Should be after module-*-restore but before module-*-detect

Lines 1-6 Link Here

(-)./files/patch-src_modules_oss_oss-util.c (-3 / +17 lines)
1	--- src/modules/oss/oss-util.c.orig 2007-11-08 21:45:25.000000000 -0500	1
2	+++ src/modules/oss/oss-util.c 2008-01-09 17:00:45.000000000 -0500	2	$FreeBSD$
3	@@ -44,6 +44,22 @@	3
		4	--- src/modules/oss/oss-util.c.orig
		5	+++ src/modules/oss/oss-util.c
		6	@@ -39,6 +39,22 @@
4		7
5	#include "oss-util.h"	8	#include "oss-util.h"
6		9
Lines 23-25 Link Here
23	int pa_oss_open(const char device, int mode, int* pcaps) {	26	int pa_oss_open(const char device, int mode, int* pcaps) {
24	int fd = -1;	27	int fd = -1;
25	int caps;	28	int caps;
		29	@@ -164,8 +180,8 @@
		30	[PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
		31	[PA_SAMPLE_S32LE] = AFMT_QUERY, /* not supported */
		32	[PA_SAMPLE_S32BE] = AFMT_QUERY, /* not supported */
		33	- [PA_SAMPLE_S24LE] = AFMT_QUERY, /* not supported */
		34	- [PA_SAMPLE_S24BE] = AFMT_QUERY, /* not supported */
		35	+ [PA_SAMPLE_S24LE] = AFMT_S24_LE,
		36	+ [PA_SAMPLE_S24BE] = AFMT_S24_BE,
		37	[PA_SAMPLE_S24_32LE] = AFMT_QUERY, /* not supported */
		38	[PA_SAMPLE_S24_32BE] = AFMT_QUERY, /* not supported */
		39	};




bin/pax11publish
bin/pulseaudio
bin/qpaeq
bin/start-pulseaudio-kde
bin/start-pulseaudio-x11
etc/bash_completion.d/pacat
etc/bash_completion.d/pacmd
etc/bash_completion.d/pactl
etc/bash_completion.d/padsp
etc/bash_completion.d/paplay
etc/bash_completion.d/parec
etc/bash_completion.d/parecord
etc/bash_completion.d/pasuspender
etc/bash_completion.d/pulseaudio
etc/dbus-1/system.d/pulseaudio-system.conf
@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
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

lib/libpulse-simple.so.0.1.0
lib/libpulse.so
lib/libpulse.so.0
lib/libpulse.so.0.18.0
lib/libpulsecore-%%PULSE_VERSION%%.so
%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so

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

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

Return to bug 198567

Lines 6-21 Link Here

(-)./Makefile (-5 / +9 lines)
6	# PORTREVISION bumps of depending ports.	6	# PORTREVISION bumps of depending ports.
7		7
8	PORTNAME= pulseaudio	8	PORTNAME= pulseaudio
9	PORTVERSION= 5.0	9	PORTVERSION= 6.0
10	PORTREVISION= 3
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/	11	MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
13		12
14	MAINTAINER= gnome@FreeBSD.org	13	MAINTAINER= gnome@FreeBSD.org
15	COMMENT= Sound server for UNIX	14	COMMENT= Sound server for UNIX
16		15
17	LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \	16	LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile \
18	libsndfile.so:${PORTSDIR}/audio/libsndfile \
19	libspeexdsp.so:${PORTSDIR}/audio/speexdsp \	17	libspeexdsp.so:${PORTSDIR}/audio/speexdsp \
20	libfftw3.so:${PORTSDIR}/math/fftw3 \	18	libfftw3.so:${PORTSDIR}/math/fftw3 \
21	libfftw3f.so:${PORTSDIR}/math/fftw3-float \	19	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
Lines 28-34 Link Here
28	USE_GNOME= glib20 intltool	26	USE_GNOME= glib20 intltool
29	USE_XORG= x11 sm xtst ice	27	USE_XORG= x11 sm xtst ice
30	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
31	USES= execinfo gettext gmake libtool pathfix pkgconfig tar:xz	29	USES= execinfo gettext gmake libtool pathfix shebangfix \
		30	pkgconfig tar:xz
32	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
33	CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \	32	CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \
34	OPENSSL_CFLAGS="-I/usr/include" \	33	OPENSSL_CFLAGS="-I/usr/include" \
Lines 39-47 Link Here
39	LDFLAGS+= -L${LOCALBASE}/lib	38	LDFLAGS+= -L${LOCALBASE}/lib
40	INSTALL_TARGET= install-strip	39	INSTALL_TARGET= install-strip
41		40
		41	SHEBANG_FILES= shell-completion/bash/pulseaudio
		42	SHEBANG_LANG= bash
		43	bash_CMD= ${SETENV} bash
		44
42	CONFIGURE_ARGS= --localstatedir=/var \	45	CONFIGURE_ARGS= --localstatedir=/var \
43	--with-database=simple \	46	--with-database=simple \
44	--without-caps \	47	--without-caps \
		48	--without-zsh-completion-dir \
45	--disable-udev \	49	--disable-udev \
46	--disable-gtk3 \	50	--disable-gtk3 \
47	--disable-systemd \	51	--disable-systemd \

Lines 1-17 Link Here

(-)./files/patch-src_daemon_default.pa.in (-11 / +20 lines)
1	--- src/daemon/default.pa.in.orig 2011-10-21 15:14:14.000000000 +0200	1	--- src/daemon/default.pa.in.orig 2015-02-12 14:10:35 UTC
2	+++ src/daemon/default.pa.in 2011-10-21 15:15:21.000000000 +0200	2	+++ src/daemon/default.pa.in
3	@@ -27,10 +27,10 @@	3	@@ -26,10 +26,10 @@ ifelse(@OS_IS_WIN32@, 1, [dnl
4	load-sample x11-bell %WINDIR%\Media\ding.wav	4	load-sample x11-bell %WINDIR%\Media\ding.wav
5	load-sample-dir-lazy %WINDIR%\Media\*.wav	5	load-sample-dir-lazy %WINDIR%\Media\*.wav
6	], [dnl	6	], [dnl
7	-#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav	7	-#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga
8	-#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav	8	-#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga
9	-#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav	9	-#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga
10	-#load-sample-lazy pulse-access /usr/share/sounds/generic.wav	10	-#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga
11	+#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav	11	+#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/freedesktop/stereo/bell.oga
12	+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/startup3.wav	12	+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga
13	+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/startup3.wav	13	+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga
14	+#load-sample-lazy pulse-access %%LOCALBASE/share/sounds/generic.wav	14	+#load-sample-lazy pulse-access %%LOCALBASE%%/share/sounds/freedesktop/stereo/message.oga
15	])dnl	15	])dnl
16		16
17	.fail	17	.fail
		18	@@ -40,7 +40,7 @@ load-module module-stream-restore
		19	load-module module-card-restore
		20
		21	### Automatically augment property information from .desktop files
		22	-### stored in /usr/share/application
		23	+### stored in %%LOCALBASE%%/share/application
		24	load-module module-augment-properties
		25
		26	### Should be after module--restore but before module--detect

Lines 11-30 Link Here

(-)./pkg-plist (-5 / +15 lines)
11	bin/pax11publish	11	bin/pax11publish
12	bin/pulseaudio	12	bin/pulseaudio
13	bin/qpaeq	13	bin/qpaeq
14	bin/start-pulseaudio-kde
15	bin/start-pulseaudio-x11	14	bin/start-pulseaudio-x11
16	etc/bash_completion.d/pulseaudio-bash-completion.sh	15	etc/bash_completion.d/pacat
		16	etc/bash_completion.d/pacmd
		17	etc/bash_completion.d/pactl
		18	etc/bash_completion.d/padsp
		19	etc/bash_completion.d/paplay
		20	etc/bash_completion.d/parec
		21	etc/bash_completion.d/parecord
		22	etc/bash_completion.d/pasuspender
		23	etc/bash_completion.d/pulseaudio
17	etc/dbus-1/system.d/pulseaudio-system.conf	24	etc/dbus-1/system.d/pulseaudio-system.conf
18	@sample etc/pulse/client.conf.sample	25	@sample etc/pulse/client.conf.sample
19	@sample etc/pulse/daemon.conf.sample	26	@sample etc/pulse/daemon.conf.sample
20	@sample etc/pulse/default.pa.sample	27	@sample etc/pulse/default.pa.sample
21	@sample etc/pulse/system.pa.sample	28	@sample etc/pulse/system.pa.sample
22	etc/xdg/autostart/pulseaudio.desktop	29	etc/xdg/autostart/pulseaudio.desktop
23	etc/xdg/autostart/pulseaudio-kde.desktop
24	include/pulse/cdecl.h	30	include/pulse/cdecl.h
25	include/pulse/channelmap.h	31	include/pulse/channelmap.h
26	include/pulse/context.h	32	include/pulse/context.h
27	include/pulse/def.h	33	include/pulse/def.h
		34	include/pulse/direction.h
28	include/pulse/error.h	35	include/pulse/error.h
29	include/pulse/ext-device-manager.h	36	include/pulse/ext-device-manager.h
30	include/pulse/ext-device-restore.h	37	include/pulse/ext-device-restore.h
Lines 62-68 Link Here
62	lib/libpulse-simple.so.0.1.0	69	lib/libpulse-simple.so.0.1.0
63	lib/libpulse.so	70	lib/libpulse.so
64	lib/libpulse.so.0	71	lib/libpulse.so.0
65	lib/libpulse.so.0.17.3	72	lib/libpulse.so.0.18.0
66	lib/libpulsecore-%%PULSE_VERSION%%.so	73	lib/libpulsecore-%%PULSE_VERSION%%.so
67	%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so	74	%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
68	lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so	75	lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
Lines 167-173 Link Here
167	man/man1/pasuspender.1.gz	174	man/man1/pasuspender.1.gz
168	man/man1/pax11publish.1.gz	175	man/man1/pax11publish.1.gz
169	man/man1/pulseaudio.1.gz	176	man/man1/pulseaudio.1.gz
170	man/man1/start-pulseaudio-kde.1.gz
171	man/man1/start-pulseaudio-x11.1.gz	177	man/man1/start-pulseaudio-x11.1.gz
172	man/man5/default.pa.5.gz	178	man/man5/default.pa.5.gz
173	man/man5/pulse-cli-syntax.5.gz	179	man/man5/pulse-cli-syntax.5.gz
Lines 244-258 Link Here
244	share/locale/pt/LC_MESSAGES/pulseaudio.mo	250	share/locale/pt/LC_MESSAGES/pulseaudio.mo
245	share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo	251	share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
246	share/locale/ru/LC_MESSAGES/pulseaudio.mo	252	share/locale/ru/LC_MESSAGES/pulseaudio.mo
		253	share/locale/sk/LC_MESSAGES/pulseaudio.mo
247	share/locale/sr/LC_MESSAGES/pulseaudio.mo	254	share/locale/sr/LC_MESSAGES/pulseaudio.mo
248	share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo	255	share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
249	share/locale/sv/LC_MESSAGES/pulseaudio.mo	256	share/locale/sv/LC_MESSAGES/pulseaudio.mo
250	share/locale/ta/LC_MESSAGES/pulseaudio.mo	257	share/locale/ta/LC_MESSAGES/pulseaudio.mo
251	share/locale/te/LC_MESSAGES/pulseaudio.mo	258	share/locale/te/LC_MESSAGES/pulseaudio.mo
		259	share/locale/tr/LC_MESSAGES/pulseaudio.mo
252	share/locale/uk/LC_MESSAGES/pulseaudio.mo	260	share/locale/uk/LC_MESSAGES/pulseaudio.mo
253	share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo	261	share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
254	share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo	262	share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
255	share/vala/vapi/libpulse-mainloop-glib.deps	263	share/vala/vapi/libpulse-mainloop-glib.deps
256	share/vala/vapi/libpulse-mainloop-glib.vapi	264	share/vala/vapi/libpulse-mainloop-glib.vapi
		265	share/vala/vapi/libpulse-simple.deps
		266	share/vala/vapi/libpulse-simple.vapi
257	share/vala/vapi/libpulse.deps	267	share/vala/vapi/libpulse.deps
258	share/vala/vapi/libpulse.vapi	268	share/vala/vapi/libpulse.vapi