Attachment #195293 for bug #229192

Lines 5-11 Link Here

(-)Makefile (-2 / +7 lines)
5	# PORTREVISION bumps of depending ports.	5	# PORTREVISION bumps of depending ports.
6		6
7	PORTNAME= pulseaudio	7	PORTNAME= pulseaudio
8	PORTVERSION= 11.1	8	PORTVERSION= 12.2
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 56-67 Link Here
56	GROUPS= pulse pulse-access pulse-rt	56	GROUPS= pulse pulse-access pulse-rt
57		57
58	OPTIONS_SUB= yes	58	OPTIONS_SUB= yes
59	OPTIONS_DEFINE= AVAHI GCONF SIMD	59	OPTIONS_DEFINE= AVAHI GCONF GSETTINGS SIMD
60	OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX	60	OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX
61	AVAHI_CONFIGURE_ENABLE= avahi	61	AVAHI_CONFIGURE_ENABLE= avahi
62	AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app	62	AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app
63	GCONF_CONFIGURE_ENABLE= gconf	63	GCONF_CONFIGURE_ENABLE= gconf
64	GCONF_USE= GNOME=gconf2	64	GCONF_USE= GNOME=gconf2
		65	GSETTINGS_DESC= GSettings configuration backend support
		66	GSETTINGS_CONFIGURE_ENABLE= gsettings
65	SIMD_CONFIGURE_ENABLE= orc	67	SIMD_CONFIGURE_ENABLE= orc
66	SIMD_LIB_DEPENDS= liborc-0.4.so:devel/orc	68	SIMD_LIB_DEPENDS= liborc-0.4.so:devel/orc
67		69
Lines 108-113 Link Here
108	${INSTALL_DATA} ${WRKSRC}/src/${ii} \	110	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
109	${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample	111	${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
110	.endfor	112	.endfor
		113	# Delete ${STAGEDIR}${PREFIX}/libexec/pulse directory, if it's empty
		114	@(cd ${STAGEDIR}${PREFIX}/libexec && \
		115	${FIND} * -prune -type d -empty -name pulse -delete)
111		116
112	post-install-BASH-off:	117	post-install-BASH-off:
113	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion	118	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1505745938	1	TIMESTAMP = 1531753054
2	SHA256 (pulseaudio-11.1.tar.xz) = f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e	2	SHA256 (pulseaudio-12.2.tar.xz) = 809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
3	SIZE (pulseaudio-11.1.tar.xz) = 1648924	3	SIZE (pulseaudio-12.2.tar.xz) = 1665092

Lines 1-11 Link Here

(-)files/patch-src_Makefile.in (-11 lines)
1	--- src/Makefile.in.orig 2017-09-05 09:14:12 UTC
2	+++ src/Makefile.in
3	@@ -11203,7 +11203,7 @@ info-am:
4
5	install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \
6	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \
7	- install-dist_udevrulesDATA install-padsplibLTLIBRARIES \
8	+ install-padsplibLTLIBRARIES \
9	install-pulseconfDATA install-pulseincludeHEADERS \
10	install-systemduserunitDATA install-xdgautostartDATA
11




--- src/modules/module-detect.c.orig	2018-05-11 11:43:30 UTC
+++ src/modules/module-detect.c
@@ -160,11 +160,40 @@ 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(&m, c, "module-oss", args) < 0)
                 continue;
+                continue;
+
+            if (!pa_endswith(line, "default"))
+                continue;
+
+            const char *p = strrchr(line, '(');
+

Lines 1-6 Link Here

(-)files/patch-src_modules_oss_module-oss.c (-2 / +2 lines)
1	--- src/modules/oss/module-oss.c.orig 2015-09-10 04:51:41 UTC	1	--- src/modules/oss/module-oss.c.orig 2018-05-07 14:30:52 UTC
2	+++ src/modules/oss/module-oss.c	2	+++ src/modules/oss/module-oss.c
3	@@ -1227,10 +1227,14 @@ int pa__init(pa_module*m) {	3	@@ -1235,10 +1235,14 @@ int pa__init(pa_module*m) {
4	use_mmap = false;	4	use_mmap = false;
5	}	5	}
6		6




# Revert some changes after following commit:
# https://github.com/pulseaudio/pulseaudio/commit/66885ad633db0f371693475c72133e91f1e09ee5

--- src/utils/padsp.c.orig	2018-05-11 11:43:31 UTC
+++ src/utils/padsp.c
@@ -2394,7 +2394,7 @@ fail:
     return ret;
 }
 
-#ifndef __GLIBC__
+#ifdef sun
 int ioctl(int fd, int request, ...) {
 #else
 int ioctl(int fd, unsigned long request, ...) {




lib/libpulse-simple.so.0.1.1
lib/libpulse.so
lib/libpulse.so.0
lib/libpulse.so.0.20.3
%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so
lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.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-always-source.so
lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so
lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so
lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.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
%%GSETTINGS%%lib/pulse-%%PULSE_VERSION%%/modules/module-gsettings.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

libdata/pkgconfig/libpulse-simple.pc
libdata/pkgconfig/libpulse.pc
%%GCONF%%libexec/pulse/gconf-helper
%%GSETTINGS%%libexec/pulse/gsettings-helper
man/man1/esdcompat.1.gz
man/man1/pacat.1.gz
man/man1/pacmd.1.gz

man/man5/pulse-cli-syntax.5.gz
man/man5/pulse-client.conf.5.gz
man/man5/pulse-daemon.conf.5.gz
%%GSETTINGS%%share/GConf/gsettings/pulseaudio.convert
%%GSETTINGS%%share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
%%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/hdmi-output-5.conf
%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-6.conf
%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-7.conf
%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-input.conf
%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf
%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-input.conf
%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-output-mono.conf
%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-output-stereo.conf
%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf
%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/dell-dock-tb16-usb-audio.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/native-instruments-traktor-audio6.conf
%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf
%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-usb-audio.conf
%%ZSH%%share/zsh/site-functions/_pulseaudio
share/locale/as/LC_MESSAGES/pulseaudio.mo
share/locale/be/LC_MESSAGES/pulseaudio.mo

Return to bug 229192

Lines 1-6 Link Here

(-)files/patch-src_modules_module-detect.c (-7 / +5 lines)
1	--- src/modules/module-detect.c.orig 2017-09-03 11:41:12 UTC	1	--- src/modules/module-detect.c.orig 2018-05-11 11:43:30 UTC
2	+++ src/modules/module-detect.c	2	+++ src/modules/module-detect.c
3	@@ -160,11 +160,41 @@ static int detect_oss(pa_core *c, int ju	3	@@ -160,11 +160,40 @@ static int detect_oss(pa_core *c, int ju
4	continue;	4	continue;
5		5
6	} else if (sscanf(line, "pcm%u: ", &device) == 1) {	6	} else if (sscanf(line, "pcm%u: ", &device) == 1) {
Lines 7-20 Link Here
7	- /* 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 */
8	- pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);	8	- pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
9	+ 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);
11		10
12	- if (!pa_module_load(c, "module-oss", args))	11	if (pa_module_load(&m, c, "module-oss", args) < 0)
13	+ if (!m)	12	continue;
14	+ continue;
15	+	13	+
16	+ if (!pa_endswith(line, "default"))	14	+ if (!pa_endswith(line, "default"))
17	continue;	15	+ continue;
18	+	16	+
19	+ const char *p = strrchr(line, '(');	17	+ const char *p = strrchr(line, '(');
20	+	18	+

Line 0 Link Here

(-)files/patch-src_utils_padsp.c (+14 lines)
	1	# Revert some changes after following commit:
	2	# https://github.com/pulseaudio/pulseaudio/commit/66885ad633db0f371693475c72133e91f1e09ee5
	3
	4	--- src/utils/padsp.c.orig 2018-05-11 11:43:31 UTC
	5	+++ src/utils/padsp.c
	6	@@ -2394,7 +2394,7 @@ fail:
	7	return ret;
	8	}
	9
	10	-#ifndef __GLIBC__
	11	+#ifdef sun
	12	int ioctl(int fd, int request, ...) {
	13	#else
	14	int ioctl(int fd, unsigned long request, ...) {

Lines 69-75 Link Here

(-)pkg-plist (-1 / +12 lines)
69	lib/libpulse-simple.so.0.1.1	69	lib/libpulse-simple.so.0.1.1
70	lib/libpulse.so	70	lib/libpulse.so
71	lib/libpulse.so.0	71	lib/libpulse.so.0
72	lib/libpulse.so.0.20.2	72	lib/libpulse.so.0.20.3
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-allow-passthrough.so	74	lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so
75	lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so	75	lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
Lines 87-92 Link Here
87	%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.so	87	%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.so
88	%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.so	88	%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.so
89	lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so	89	lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so
		90	lib/pulse-%%PULSE_VERSION%%/modules/module-always-source.so
90	lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so	91	lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so
91	lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so	92	lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so
92	lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so	93	lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
Lines 109-114 Link Here
109	lib/pulse-%%PULSE_VERSION%%/modules/module-filter-apply.so	110	lib/pulse-%%PULSE_VERSION%%/modules/module-filter-apply.so
110	lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.so	111	lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.so
111	%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so	112	%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
		113	%%GSETTINGS%%lib/pulse-%%PULSE_VERSION%%/modules/module-gsettings.so
112	lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so	114	lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
113	lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so	115	lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
114	lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so	116	lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so
Lines 166-171 Link Here
166	libdata/pkgconfig/libpulse-simple.pc	168	libdata/pkgconfig/libpulse-simple.pc
167	libdata/pkgconfig/libpulse.pc	169	libdata/pkgconfig/libpulse.pc
168	%%GCONF%%libexec/pulse/gconf-helper	170	%%GCONF%%libexec/pulse/gconf-helper
		171	%%GSETTINGS%%libexec/pulse/gsettings-helper
169	man/man1/esdcompat.1.gz	172	man/man1/esdcompat.1.gz
170	man/man1/pacat.1.gz	173	man/man1/pacat.1.gz
171	man/man1/pacmd.1.gz	174	man/man1/pacmd.1.gz
Lines 183-188 Link Here
183	man/man5/pulse-cli-syntax.5.gz	186	man/man5/pulse-cli-syntax.5.gz
184	man/man5/pulse-client.conf.5.gz	187	man/man5/pulse-client.conf.5.gz
185	man/man5/pulse-daemon.conf.5.gz	188	man/man5/pulse-daemon.conf.5.gz
		189	%%GSETTINGS%%share/GConf/gsettings/pulseaudio.convert
		190	%%GSETTINGS%%share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
186	%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf	191	%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
187	%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf	192	%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf
188	%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf	193	%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf
Lines 216-223 Link Here
216	%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-5.conf	221	%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-5.conf
217	%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-6.conf	222	%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-6.conf
218	%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-7.conf	223	%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-7.conf
		224	%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-input.conf
219	%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf	225	%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf
		226	%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-input.conf
		227	%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-output-mono.conf
		228	%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-output-stereo.conf
220	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf	229	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf
		230	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/dell-dock-tb16-usb-audio.conf
221	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf	231	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf
222	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker.conf	232	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker.conf
223	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf	233	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf
Lines 230-235 Link Here
230	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf	240	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf
231	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf	241	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
232	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf	242	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf
		243	%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-usb-audio.conf
233	%%ZSH%%share/zsh/site-functions/_pulseaudio	244	%%ZSH%%share/zsh/site-functions/_pulseaudio
234	share/locale/as/LC_MESSAGES/pulseaudio.mo	245	share/locale/as/LC_MESSAGES/pulseaudio.mo
235	share/locale/be/LC_MESSAGES/pulseaudio.mo	246	share/locale/be/LC_MESSAGES/pulseaudio.mo