Attachment #173626 for bug #211684




# PORTREVISION bumps of depending ports.

PORTNAME=	pulseaudio
PORTVERSION=	9.0
CATEGORIES=	audio
MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/


LICENSE_FILE=	${WRKSRC}/LGPL

LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
		libspeexdsp.so:audio/speexdsp \
		libfftw3.so:math/fftw3 \
		libfftw3f.so:math/fftw3-float \
		liborc-0.4.so:devel/orc \
		libjson-c.so:devel/json-c \
		libdbus-1.so:devel/dbus \
		libltdl.so:devel/libltdl \
		libck-connector.so:sysutils/consolekit

USE_GNOME=	glib20 intltool
USE_XORG=	ice sm x11 xcb xtst
USE_LDCONFIG=	yes
USES=		compiler:c11 cpe execinfo gettext gmake gnome iconv libtool \
		localbase pathfix pkgconfig shebangfix ssl tar:xz
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
		LIBS="-lm -lintl" \
		ac_cv_header_linux_input_h=""
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
INSTALL_TARGET=	install-strip

SHEBANG_FILES=	shell-completion/bash/pulseaudio

SUB_FILES=	pkg-message

CONFIGURE_ARGS=	--localstatedir=/var \
		--with-database=simple \
		--without-caps \
		--disable-udev \
		--disable-gtk3 \
		--disable-systemd-daemon \
		--disable-systemd-journal \
		--disable-systemd-login \
		--disable-neon-opt \
		--disable-xen \
		--disable-lirc # untested

#FIXME --with-database=auto|tdb|gdbm|simple

USERS=		pulse
GROUPS=		pulse pulse-access pulse-rt

OPTIONS_SUB=	yes
OPTIONS_DEFINE=	AVAHI GCONF SIMD
OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX
JACK_CONFIGURE_ENABLE=	jack
JACK_LIB_DEPENDS=	libjack.so:audio/jack
AVAHI_CONFIGURE_ENABLE=	avahi
AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
GCONF_CONFIGURE_ENABLE=	gconf
GCONF_USE=	GNOME=gconf2
ALSA_CONFIGURE_ENABLE=	alsa
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
SIMD_CONFIGURE_ENABLE=	orc
SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc

OPTIONS_GROUP=	AUDIO COMPLETIONS
OPTIONS_GROUP_AUDIO=	ALSA JACK SOXR SPEEX
OPTIONS_GROUP_COMPLETIONS=	BASH ZSH
AUDIO_DESC=	Supported audio
COMPLETIONS_DESC=	Programmable completions
ALSA_CONFIGURE_ENABLE=	alsa
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
JACK_CONFIGURE_ENABLE=	jack
JACK_LIB_DEPENDS=	libjack.so:audio/jack
SOXR_DESC=	SoX resampler support
SOXR_CONFIGURE_WITH=	soxr
SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
SPEEX_DESC=	Speex resampler and AEC support
SPEEX_CONFIGURE_WITH=	speex
SPEEX_LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir

OPTIONS_SINGLE=	DATABASE
OPTIONS_SINGLE_DATABASE=	TDB GDBM SIMPLE
DATABASE_DESC=	Supported database
GDBM_DESC=	GNU database manager support
GDBM_CONFIGURE_ON=	--with-database=gdbm
GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
SIMPLE_DESC=	Simple database support
SIMPLE_CONFIGURE_ON=	--with-database=simple
TDB_DESC=	Trivial database support
TDB_CONFIGURE_ON=	--with-database=tdb
TDB_LIB_DEPENDS=	libtdb.so:databases/tdb

PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
		${WRKSRC}/src/daemon/default.pa.in
	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
		-e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
		${WRKSRC}/configure

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}.sample
.endfor

post-install-BASH-off:
	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)pulseaudio/distinfo (-2 / +3 lines)
1	SHA256 (pulseaudio-8.0.tar.xz) = 690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989	1	TIMESTAMP = 1466578411
2	SIZE (pulseaudio-8.0.tar.xz) = 1517656	2	SHA256 (pulseaudio-9.0.tar.xz) = c3d3d66b827f18fbe903fe3df647013f09fc1e2191c035be1ee2d82a9e404686
		3	SIZE (pulseaudio-9.0.tar.xz) = 1537568

Lines 1-6 Link Here

(-)pulseaudio/files/patch-src_Makefile.in (-2 / +2 lines)
1	--- src/Makefile.in.orig 2016-01-22 07:34:26 UTC	1	--- src/Makefile.in.orig 2016-06-24 23:00:54 UTC
2	+++ src/Makefile.in	2	+++ src/Makefile.in
3	@@ -11042,7 +11042,7 @@ info-am:	3	@@ -11092,7 +11092,7 @@ info-am:
4		4
5	install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \	5	install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \
6	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \	6	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \




--- src/daemon/default.pa.in.orig	2016-01-18 10:14:20 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




--- src/modules/module-detect.c.orig	2016-05-10 12:28:04 UTC
+++ src/modules/module-detect.c
@@ -160,11 +160,45 @@ static int detect_oss(pa_core *c, int ju
 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",
@@ -157,8 +159,7 @@ static int detect_oss(pa_core *c, int ju
                 continue;
 
         } else if (sscanf(line, "pcm%u: ", &device) == 1) {
-            /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */
-            pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
+            pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device);
+            pa_module *m = pa_module_load(c, "module-oss", args);
 
-            if (!pa_module_load(c, "module-oss", args))
+            if (!m)
+                continue;
+
+            if (!pa_endswith(line, "default"))
+                continue;
+
+            const char *p = strrchr(line, '>');
+
+            if (!p)
                 continue;
+
+            if (!c->default_sink && strstr(p, "play")) {
+                uint32_t idx = PA_IDXSET_INVALID;
+                pa_sink *s;
+                PA_IDXSET_FOREACH(s, c->sinks, idx) {
+                    if (s->module == m) {
+                        if (!pa_namereg_set_default_sink(c, s))
+                            pa_log_error("failed to set default sink for device: /dev/dsp%u", device);
+
+                        break;
+                    }
+                }
+            }
+
+            if (!c->default_source && strstr(p, "rec")) {
+                uint32_t idx = PA_IDXSET_INVALID;
+                pa_source *s;
+                PA_IDXSET_FOREACH(s, c->sources, idx) {
+                    if (s->module == m) {
+                        if (!pa_namereg_set_default_source(c, s))
+                            pa_log_error("failed to set default source for device: /dev/dsp%u", device);
+
+                        break;
+                    }
+                }
+            }
         }
 
         n++;

Lines 1-6 Link Here

(-)pulseaudio/files/patch-src_pulsecore_shm.c (-2 / +2 lines)
1	--- src/pulsecore/shm.c.orig 2015-12-31 06:28:35 UTC	1	--- src/pulsecore/shm.c.orig 2016-06-21 10:58:21 UTC
2	+++ src/pulsecore/shm.c	2	+++ src/pulsecore/shm.c
3	@@ -95,7 +95,7 @@ struct shm_marker {	3	@@ -102,7 +102,7 @@ static inline size_t shm_marker_size(pa_
4		4
5	#ifdef HAVE_SHM_OPEN	5	#ifdef HAVE_SHM_OPEN
6	static char segment_name(char fn, size_t l, unsigned id) {	6	static char segment_name(char fn, size_t l, unsigned id) {




Pulseaudio tries to determine default values for FreeBSD OSS driver at first
start, based on /dev/sndstat output. The hw.snd.default_unit sysctl may affect
these values, but restart of the Pulseaudio might be needed to rescan it again,
e.g. `pacmd exit`.

Pulseaudio has separate input and output configure lines. You can change them
with using following commands:
for Pulseaudio we also need to tell it which input/output to use. The
difference is that Pulseaudio has separate input and output configure lines.

To change the default sink (output):
# pacmd set-default-sink 3


This can also be set in %%PREFIX%%/etc/pulse/default.pa

Replace the number '3' with the new default you want to set.


The audio/freedesktop-sound-theme is needed if the default sound files

Lines 69-75 Link Here

(-)pulseaudio/pkg-plist (-1 / +1 lines)
69	lib/libpulse-simple.so.0.1.0	69	lib/libpulse-simple.so.0.1.0
70	lib/libpulse.so	70	lib/libpulse.so
71	lib/libpulse.so.0	71	lib/libpulse.so.0
72	lib/libpulse.so.0.19.0	72	lib/libpulse.so.0.20.0
73	%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so	73	%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
74	lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so	74	lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
75	%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so	75	%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so

Return to bug 211684

Lines 5-11 Link Here

(-)pulseaudio/Makefile (-23 / +42 lines)
5	# PORTREVISION bumps of depending ports.	5	# PORTREVISION bumps of depending ports.
6		6
7	PORTNAME= pulseaudio	7	PORTNAME= pulseaudio
8	PORTVERSION= 8.0	8	PORTVERSION= 9.0
9	CATEGORIES= audio	9	CATEGORIES= audio
10	MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/	10	MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
11		11
Lines 16-43 Link Here
16	LICENSE_FILE= ${WRKSRC}/LGPL	16	LICENSE_FILE= ${WRKSRC}/LGPL
17		17
18	LIB_DEPENDS= libsndfile.so:audio/libsndfile \	18	LIB_DEPENDS= libsndfile.so:audio/libsndfile \
19	libspeexdsp.so:audio/speexdsp \
20	libfftw3.so:math/fftw3 \	19	libfftw3.so:math/fftw3 \
21	libfftw3f.so:math/fftw3-float \	20	libfftw3f.so:math/fftw3-float \
22	liborc-0.4.so:devel/orc \
23	libjson-c.so:devel/json-c \	21	libjson-c.so:devel/json-c \
24	libdbus-1.so:devel/dbus \	22	libdbus-1.so:devel/dbus \
25	libltdl.so:devel/libltdl \	23	libltdl.so:devel/libltdl \
26	libck-connector.so:sysutils/consolekit	24	libck-connector.so:sysutils/consolekit
27		25
28	USE_GNOME= glib20 intltool	26	USE_GNOME= glib20 intltool
29	USE_XORG= x11 sm xtst ice	27	USE_XORG= ice sm x11 xcb xtst
30	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
31	USES= cpe compiler:c11 execinfo gettext gmake gnome libtool \	29	USES= compiler:c11 cpe execinfo gettext gmake gnome iconv libtool \
32	pathfix pkgconfig shebangfix tar:xz	30	localbase pathfix pkgconfig shebangfix ssl tar:xz
33	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
34	CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \	32	CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \
35	OPENSSL_CFLAGS="-I/usr/include" \	33	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
36	OPENSSL_LIBS="-lcrypto -lssl" \	34	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
37	LIBS="-lm -lintl" \	35	LIBS="-lm -lintl" \
38	ac_cv_header_linux_input_h=""	36	ac_cv_header_linux_input_h=""
39	CPPFLAGS+= -I${LOCALBASE}/include
40	LDFLAGS+= -L${LOCALBASE}/lib
41	INSTALL_TARGET= install-strip	37	INSTALL_TARGET= install-strip
42		38
43	SHEBANG_FILES= shell-completion/bash/pulseaudio	39	SHEBANG_FILES= shell-completion/bash/pulseaudio
Lines 45-97 Link Here
45	SUB_FILES= pkg-message	41	SUB_FILES= pkg-message
46		42
47	CONFIGURE_ARGS= --localstatedir=/var \	43	CONFIGURE_ARGS= --localstatedir=/var \
48	--with-database=simple \
49	--without-caps \	44	--without-caps \
50	--disable-udev \	45	--disable-udev \
51	--disable-gtk3 \	46	--disable-gtk3 \
52	--disable-systemd \	47	--disable-systemd-daemon \
		48	--disable-systemd-journal \
		49	--disable-systemd-login \
53	--disable-neon-opt \	50	--disable-neon-opt \
54	--disable-xen \	51	--disable-xen \
55	--disable-lirc # untested	52	--disable-lirc # untested
56		53
57	#FIXME --with-database=auto\|tdb\|gdbm\|simple
58
59	USERS= pulse	54	USERS= pulse
60	GROUPS= pulse pulse-access pulse-rt	55	GROUPS= pulse pulse-access pulse-rt
61		56
62	OPTIONS_SUB= yes	57	OPTIONS_SUB= yes
63	OPTIONS_DEFINE= JACK AVAHI GCONF ALSA SIMD BASH ZSH	58	OPTIONS_DEFINE= AVAHI GCONF SIMD
64	OPTIONS_DEFAULT=AVAHI SIMD	59	OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX
65	JACK_CONFIGURE_ENABLE= jack
66	JACK_LIB_DEPENDS= libjack.so:audio/jack
67	AVAHI_CONFIGURE_ENABLE= avahi	60	AVAHI_CONFIGURE_ENABLE= avahi
68	AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app	61	AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app
69	GCONF_CONFIGURE_ENABLE= gconf	62	GCONF_CONFIGURE_ENABLE= gconf
70	GCONF_USE= GNOME=gconf2	63	GCONF_USE= GNOME=gconf2
71	ALSA_CONFIGURE_ENABLE= alsa
72	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
73	SIMD_CONFIGURE_ENABLE= orc	64	SIMD_CONFIGURE_ENABLE= orc
74	SIMD_LIB_DEPENDS= liborc-0.4.so:devel/orc	65	SIMD_LIB_DEPENDS= liborc-0.4.so:devel/orc
		66
		67	OPTIONS_GROUP= AUDIO COMPLETIONS
		68	OPTIONS_GROUP_AUDIO= ALSA JACK SOXR SPEEX
		69	OPTIONS_GROUP_COMPLETIONS= BASH ZSH
		70	AUDIO_DESC= Supported audio
		71	COMPLETIONS_DESC= Programmable completions
		72	ALSA_CONFIGURE_ENABLE= alsa
		73	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
		74	JACK_CONFIGURE_ENABLE= jack
		75	JACK_LIB_DEPENDS= libjack.so:audio/jack
		76	SOXR_DESC= SoX resampler support
		77	SOXR_CONFIGURE_WITH= soxr
		78	SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
		79	SPEEX_DESC= Speex resampler and AEC support
		80	SPEEX_CONFIGURE_WITH= speex
		81	SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp
75	ZSH_CONFIGURE_OFF= --without-zsh-completion-dir	82	ZSH_CONFIGURE_OFF= --without-zsh-completion-dir
76		83
		84	OPTIONS_SINGLE= DATABASE
		85	OPTIONS_SINGLE_DATABASE= TDB GDBM SIMPLE
		86	DATABASE_DESC= Supported database
		87	GDBM_DESC= GNU database manager support
		88	GDBM_CONFIGURE_ON= --with-database=gdbm
		89	GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
		90	SIMPLE_DESC= Simple database support
		91	SIMPLE_CONFIGURE_ON= --with-database=simple
		92	TDB_DESC= Trivial database support
		93	TDB_CONFIGURE_ON= --with-database=tdb
		94	TDB_LIB_DEPENDS= libtdb.so:databases/tdb
		95
77	PULSE_VERSION= ${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}	96	PULSE_VERSION= ${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
78	PLIST_SUB= PULSE_VERSION=${PULSE_VERSION}	97	PLIST_SUB= PULSE_VERSION=${PULSE_VERSION}
79		98
80	post-patch:	99	post-patch:
81	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \	100	@${REINPLACE_CMD} -e 's\|/usr/share\|${LOCALBASE}/share\|g' \
82	${WRKSRC}/src/daemon/default.pa.in	101	${WRKSRC}/src/daemon/default.pa.in
83	@${REINPLACE_CMD} -e 's\|-Wmissing-include-dirs\|\|g' \	102	@${REINPLACE_CMD} -e 's\|-Wmissing-include-dirs\|\|g' \
84	-e 's\|/lib/dbus/machine-id\|/db/dbus/machine-id\|g' \	103	-e 's\|/lib/dbus/machine-id\|/db/dbus/machine-id\|g' \
85	${WRKSRC}/configure	104	${WRKSRC}/configure
86		105
87	post-install:	106	post-install:
88	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse	107	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse
89	.for ii in default.pa daemon.conf client.conf system.pa	108	.for ii in default.pa daemon.conf client.conf system.pa
90	${INSTALL_DATA} ${WRKSRC}/src/${ii} \	109	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
91	${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample	110	${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
92	.endfor	111	.endfor
93		112
94	post-install-BASH-off:	113	post-install-BASH-off:
95	@${RM} -rf ${STAGEDIR}${PREFIX}/share/bash-completion	114	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion
96		115
97	.include <bsd.port.mk>	116	.include <bsd.port.mk>

Lines 1-26 Link Here

(-)pulseaudio/files/patch-src_daemon_default.pa.in (-26 lines)
1	--- src/daemon/default.pa.in.orig 2016-01-18 10:14:20 UTC
2	+++ src/daemon/default.pa.in
3	@@ -26,10 +26,10 @@ ifelse(@OS_IS_WIN32@, 1, [dnl
4	load-sample x11-bell %WINDIR%\Media\ding.wav
5	load-sample-dir-lazy %WINDIR%\Media\*.wav
6	], [dnl
7	-#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga
8	-#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga
9	-#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga
10	-#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga
11	+#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/freedesktop/stereo/bell.oga
12	+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga
13	+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga
14	+#load-sample-lazy pulse-access %%LOCALBASE%%/share/sounds/freedesktop/stereo/message.oga
15	])dnl
16
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 1-22 Link Here

(-)pulseaudio/files/patch-src_modules_module-detect.c (-13 / +42 lines)
1	--- src/modules/module-detect.c.orig 2015-09-10 04:51:41 UTC	1	--- src/modules/module-detect.c.orig 2016-05-10 12:28:04 UTC
2	+++ src/modules/module-detect.c	2	+++ src/modules/module-detect.c
3	@@ -46,7 +46,9 @@ PA_MODULE_DESCRIPTION("Detect available	3	@@ -160,11 +160,45 @@ static int detect_oss(pa_core *c, int ju
4	PA_MODULE_VERSION(PACKAGE_VERSION);
5	PA_MODULE_LOAD_ONCE(true);
6	PA_MODULE_USAGE("just-one=<boolean>");
7	+#ifdef __linux__
8	PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-detect!");
9	+#endif
10
11	static const char* const valid_modargs[] = {
12	"just-one",
13	@@ -157,8 +159,7 @@ static int detect_oss(pa_core *c, int ju
14	continue;	4	continue;
15		5
16	} else if (sscanf(line, "pcm%u: ", &device) == 1) {	6	} else if (sscanf(line, "pcm%u: ", &device) == 1) {
17	- /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */	7	- /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */
18	- pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);	8	- pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
19	+ pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device);	9	+ pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device);
		10	+ pa_module *m = pa_module_load(c, "module-oss", args);
20		11
21	if (!pa_module_load(c, "module-oss", args))	12	- if (!pa_module_load(c, "module-oss", args))
		13	+ if (!m)
		14	+ continue;
		15	+
		16	+ if (!pa_endswith(line, "default"))
		17	+ continue;
		18	+
		19	+ const char *p = strrchr(line, '>');
		20	+
		21	+ if (!p)
22	continue;	22	continue;
		23	+
		24	+ if (!c->default_sink && strstr(p, "play")) {
		25	+ uint32_t idx = PA_IDXSET_INVALID;
		26	+ pa_sink *s;
		27	+ PA_IDXSET_FOREACH(s, c->sinks, idx) {
		28	+ if (s->module == m) {
		29	+ if (!pa_namereg_set_default_sink(c, s))
		30	+ pa_log_error("failed to set default sink for device: /dev/dsp%u", device);
		31	+
		32	+ break;
		33	+ }
		34	+ }
		35	+ }
		36	+
		37	+ if (!c->default_source && strstr(p, "rec")) {
		38	+ uint32_t idx = PA_IDXSET_INVALID;
		39	+ pa_source *s;
		40	+ PA_IDXSET_FOREACH(s, c->sources, idx) {
		41	+ if (s->module == m) {
		42	+ if (!pa_namereg_set_default_source(c, s))
		43	+ pa_log_error("failed to set default source for device: /dev/dsp%u", device);
		44	+
		45	+ break;
		46	+ }
		47	+ }
		48	+ }
		49	}
		50
		51	n++;

Lines 1-8 Link Here

(-)pulseaudio/files/pkg-message.in (-5 / +7 lines)
		1	Pulseaudio tries to determine default values for FreeBSD OSS driver at first
		2	start, based on /dev/sndstat output. The hw.snd.default_unit sysctl may affect
		3	these values, but restart of the Pulseaudio might be needed to rescan it again,
		4	e.g. `pacmd exit`.
1		5
2	Pulseaudio doesn't know about the hw.snd.default_unit=3 sysctl for the	6	Pulseaudio has separate input and output configure lines. You can change them
3	FreeBSD OSS driver that is used to select the active input/output. So	7	with using following commands:
4	for Pulseaudio we also need to tell it which input/output to use. The
5	difference is that Pulseaudio has separate input and output configure lines.
6		8
7	To change the default sink (output):	9	To change the default sink (output):
8	# pacmd set-default-sink 3	10	# pacmd set-default-sink 3
Lines 11-17 Link Here
11		13
12	This can also be set in %%PREFIX%%/etc/pulse/default.pa	14	This can also be set in %%PREFIX%%/etc/pulse/default.pa
13		15
14	Replace the number '3' with the new default your want to set.	16	Replace the number '3' with the new default you want to set.
15		17
16		18
17	The audio/freedesktop-sound-theme is needed if the default sound files	19	The audio/freedesktop-sound-theme is needed if the default sound files