Attachment 198147 Details for Bug 229192 – Proposed patch (since 481920 revision)

[patch] Proposed patch (since 481920 revision)

pulseaudio.diff (text/plain), 8.74 KB, created by lightside on 2018-10-14 19:09:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2018-10-14 19:09:17 UTC

Size: 8.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 481920)
>+++ Makefile	(working copy)
>@@ -5,8 +5,7 @@
> # PORTREVISION bumps of depending ports.
> 
> PORTNAME=	pulseaudio
>-PORTVERSION=	11.1
>-PORTREVISION=	2
>+PORTVERSION=	12.2
> CATEGORIES=	audio
> MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
> 
>@@ -23,11 +22,12 @@
> 		libltdl.so:devel/libltdl \
> 		libck-connector.so:sysutils/consolekit2
> 
>+USES=		compiler:c11 cpe gettext gmake gnome iconv libtool \
>+		pathfix pkgconfig python:run shebangfix ssl tar:xz
>+
> USE_GNOME=	glib20 intltool
> USE_XORG=	ice sm x11 xcb xtst
> USE_LDCONFIG=	yes
>-USES=		compiler:c11 cpe gettext gmake gnome iconv libtool \
>-		pathfix pkgconfig python:run shebangfix ssl tar:xz
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
> 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
>@@ -57,12 +57,14 @@
> GROUPS=		pulse pulse-access pulse-rt
> 
> OPTIONS_SUB=	yes
>-OPTIONS_DEFINE=	AVAHI GCONF SIMD
>+OPTIONS_DEFINE=	AVAHI GCONF GSETTINGS SIMD
> OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX WEBRTC_AEC
> AVAHI_CONFIGURE_ENABLE=	avahi
> AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
> GCONF_CONFIGURE_ENABLE=	gconf
> GCONF_USE=	GNOME=gconf2
>+GSETTINGS_DESC=	GSettings configuration backend support
>+GSETTINGS_CONFIGURE_ENABLE=	gsettings
> SIMD_CONFIGURE_ENABLE=	orc
> SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc
> 
>@@ -112,6 +114,9 @@
> 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
> 		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
> .endfor
>+# Delete ${STAGEDIR}${PREFIX}/libexec/pulse directory, if it's empty
>+	@(cd ${STAGEDIR}${PREFIX}/libexec && \
>+		${FIND} * -maxdepth 0 -type d -empty -name pulse -delete)
> 
> post-install-BASH-off:
> 	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion
>Index: distinfo
>===================================================================
>--- distinfo	(revision 481920)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1505745938
>-SHA256 (pulseaudio-11.1.tar.xz) = f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e
>-SIZE (pulseaudio-11.1.tar.xz) = 1648924
>+TIMESTAMP = 1531753054
>+SHA256 (pulseaudio-12.2.tar.xz) = 809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
>+SIZE (pulseaudio-12.2.tar.xz) = 1665092
>Index: files/patch-src_Makefile.in
>===================================================================
>--- files/patch-src_Makefile.in	(revision 481920)
>+++ files/patch-src_Makefile.in	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/Makefile.in.orig	2017-09-05 09:14:12 UTC
>-+++ src/Makefile.in
>-@@ -11203,7 +11203,7 @@ info-am:
>- 
>- install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \
>- 	install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \
>--	install-dist_udevrulesDATA install-padsplibLTLIBRARIES \
>-+	install-padsplibLTLIBRARIES \
>- 	install-pulseconfDATA install-pulseincludeHEADERS \
>- 	install-systemduserunitDATA install-xdgautostartDATA
>- 
>Index: files/patch-src_modules_module-detect.c
>===================================================================
>--- files/patch-src_modules_module-detect.c	(revision 481920)
>+++ files/patch-src_modules_module-detect.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/modules/module-detect.c.orig	2017-09-03 11:41:12 UTC
>+--- src/modules/module-detect.c.orig	2018-05-11 11:43:30 UTC
> +++ src/modules/module-detect.c
>-@@ -160,11 +160,41 @@ static int detect_oss(pa_core *c, int ju
>+@@ -160,11 +160,40 @@ static int detect_oss(pa_core *c, int ju
>                  continue;
>  
>          } else if (sscanf(line, "pcm%u: ", &device) == 1) {
>@@ -7,14 +7,12 @@
> -            /* 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_module_load(&m, c, "module-oss", args) < 0)
>+                 continue;
> +
> +            if (!pa_endswith(line, "default"))
>-                 continue;
>++                continue;
> +
> +            const char *p = strrchr(line, '(');
> +
>Index: files/patch-src_modules_oss_module-oss.c
>===================================================================
>--- files/patch-src_modules_oss_module-oss.c	(revision 481920)
>+++ files/patch-src_modules_oss_module-oss.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/modules/oss/module-oss.c.orig	2015-09-10 04:51:41 UTC
>+--- src/modules/oss/module-oss.c.orig	2018-05-07 14:30:52 UTC
> +++ src/modules/oss/module-oss.c
>-@@ -1227,10 +1227,14 @@ int pa__init(pa_module*m) {
>+@@ -1235,10 +1235,14 @@ int pa__init(pa_module*m) {
>          use_mmap = false;
>      }
>  
>Index: files/patch-src_utils_padsp.c
>===================================================================
>--- files/patch-src_utils_padsp.c	(nonexistent)
>+++ files/patch-src_utils_padsp.c	(working copy)
>@@ -0,0 +1,14 @@
>+# 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, ...) {
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 481920)
>+++ pkg-plist	(working copy)
>@@ -69,7 +69,7 @@
> lib/libpulse-simple.so.0.1.1
> lib/libpulse.so
> lib/libpulse.so.0
>-lib/libpulse.so.0.20.2
>+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
>@@ -88,6 +88,7 @@
> %%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
>@@ -110,6 +111,7 @@
> 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
>@@ -167,6 +169,7 @@
> 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
>@@ -184,6 +187,8 @@
> 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
>@@ -217,8 +222,13 @@
> %%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
>@@ -231,6 +241,7 @@
> %%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

Flags:

lightside: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 229192: 194439 | 195293 | 195696 | 195699 | 198147