Attachment 207491 Details for Bug 240585 – Proposed patch (since 507372 revision)

[patch] Proposed patch (since 507372 revision)

pulseaudio.diff (text/plain), 5.26 KB, created by lightside on 2019-09-14 23:25:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2019-09-14 23:25:37 UTC

Size: 5.26 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 507372)
>+++ Makefile	(working copy)
>@@ -5,8 +5,7 @@
> # PORTREVISION bumps of depending ports.
> 
> PORTNAME=	pulseaudio
>-PORTVERSION=	12.2
>-PORTREVISION=	6
>+PORTVERSION=	13.0
> CATEGORIES=	audio
> MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
> 
>@@ -26,7 +25,7 @@
> USES=		compiler:c11 cpe gettext gmake gnome iconv libtool \
> 		pathfix pkgconfig python:run shebangfix ssl tar:xz
> 
>-USE_GNOME=	glib20 intltool
>+USE_GNOME=	glib20
> USE_XORG=	ice sm x11 xcb xtst
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>@@ -40,6 +39,7 @@
> INSTALL_TARGET=	install-strip
> 
> SHEBANG_FILES=	shell-completion/bash/pulseaudio \
>+		src/utils/pa-info \
> 		src/utils/qpaeq
> bash_CMD=	${SETENV} bash
> SUB_FILES=	pkg-message
>Index: distinfo
>===================================================================
>--- distinfo	(revision 507372)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1531753054
>-SHA256 (pulseaudio-12.2.tar.xz) = 809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
>-SIZE (pulseaudio-12.2.tar.xz) = 1665092
>+TIMESTAMP = 1568380928
>+SHA256 (pulseaudio-13.0.tar.xz) = 961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
>+SIZE (pulseaudio-13.0.tar.xz) = 1901768
>Index: files/patch-src_pulsecore_atomic.h
>===================================================================
>--- files/patch-src_pulsecore_atomic.h	(revision 507372)
>+++ files/patch-src_pulsecore_atomic.h	(working copy)
>@@ -1,6 +1,15 @@
>---- src/pulsecore/atomic.h.orig	2016-08-23 12:50:11 UTC
>+--- src/pulsecore/atomic.h.orig	2019-09-13 13:10:23 UTC
> +++ src/pulsecore/atomic.h
>-@@ -185,39 +185,6 @@ static inline bool pa_atomic_ptr_cmpxchg
>+@@ -117,7 +117,7 @@ static inline void* pa_atomic_ptr_load(c
>+ }
>+ 
>+ static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) {
>+-    __atomic_store_n(&a->value, p, __ATOMIC_SEQ_CST);
>++    __atomic_store_n(&a->value, (uintptr_t)p, __ATOMIC_SEQ_CST);
>+ }
>+ 
>+ #else
>+@@ -218,39 +218,6 @@ static inline bool pa_atomic_ptr_cmpxchg
>  #include <sys/param.h>
>  #include <machine/atomic.h>
>  
>Index: files/patch-src_tests_atomic-test.c
>===================================================================
>--- files/patch-src_tests_atomic-test.c	(nonexistent)
>+++ files/patch-src_tests_atomic-test.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/tests/atomic-test.c.orig	2019-09-13 13:10:23 UTC
>++++ src/tests/atomic-test.c
>+@@ -51,6 +51,11 @@
>+ 
>+ #define MEMORY_SIZE (8 * 2 * 1024 * 1024)
>+ 
>++#ifdef __FreeBSD__
>++#include <sys/cpuset.h>
>++#define cpu_set_t cpuset_t
>++#endif
>++
>+ 
>+ typedef struct io_t {
>+    pa_atomic_t *flag;
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 507372)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,4 @@
>+bin/pa-info
> bin/pacat
> bin/pacmd
> bin/pactl
>@@ -68,7 +69,7 @@
> lib/libpulse-simple.so.0.1.1
> lib/libpulse.so
> lib/libpulse.so.0
>-lib/libpulse.so.0.20.3
>+lib/libpulse.so.0.21.1
> %%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
>@@ -215,9 +216,12 @@
> %%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/paths/steelseries-arctis-5-output-chat.conf
>+%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-5-output-game.conf
>+%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-input.conf
>+%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-output-mono.conf
>+%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-output-stereo.conf
>+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/cmedia-high-speed-true-hdaudio.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
>@@ -232,13 +236,16 @@
> %%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
>+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-5-usb-audio.conf
>+%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-7-usb-audio.conf
> share/zsh/site-functions/_pulseaudio
>+share/locale/af/LC_MESSAGES/pulseaudio.mo
> share/locale/as/LC_MESSAGES/pulseaudio.mo
> share/locale/be/LC_MESSAGES/pulseaudio.mo
> share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
> share/locale/ca/LC_MESSAGES/pulseaudio.mo
> share/locale/cs/LC_MESSAGES/pulseaudio.mo
>+share/locale/da/LC_MESSAGES/pulseaudio.mo
> share/locale/de/LC_MESSAGES/pulseaudio.mo
> share/locale/de_CH/LC_MESSAGES/pulseaudio.mo
> share/locale/el/LC_MESSAGES/pulseaudio.mo

Flags:

lightside: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 240585: 207491