Attachment #222036 for bug #252957




# PORTREVISION bumps of depending ports.

PORTNAME=	pulseaudio
DISTVERSION=	14.2
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	https://freedesktop.org/software/pulseaudio/releases/

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

		libltdl.so:devel/libltdl \
		libck-connector.so:sysutils/consolekit2

USES=		compiler:c11 cpe gettext gmake gnome iconv libtool localbase:ldflags \
		pathfix pkgconfig python:run shebangfix ssl tar:xz xorg

USE_GNOME=	glib20

		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 \

SPEEX_CONFIGURE_WITH=	speex
SPEEX_LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
WEBRTC_AEC_DESC=	WebRTC-based echo canceller
WEBRTC_AEC_LIB_DEPENDS=	libwebrtc_audio_processing.so:audio/webrtc-audio-processing
WEBRTC_AEC_CONFIGURE_ENABLE=	webrtc-aec

OPTIONS_SINGLE=	DATABASE

Lines 1-3 Link Here

(-)audio/pulseaudio/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1568380928	1	TIMESTAMP = 1568380928
2	SHA256 (pulseaudio-13.0.tar.xz) = 961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057	2	SHA256 (pulseaudio-14.2.tar.xz) = 75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1
3	SIZE (pulseaudio-13.0.tar.xz) = 1901768	3	SIZE (pulseaudio-14.2.tar.xz) = 1951300




--- src/pulsecore/atomic.h.orig	2020-07-17 12:11:11.000000000 +0200
+++ src/pulsecore/atomic.h	2021-01-23 21:16:28.683759000 +0100
@@ -117,7 +117,7 @@
 }
 
 static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) {
-    __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST);
+    __atomic_store_n(&a->value, (uintptr_t) p, __ATOMIC_SEQ_CST);
 }
 
 #else
@@ -217,39 +217,6 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <machine/atomic.h>
-
-#if __FreeBSD_version < 600000
-#if defined(__i386__) || defined(__amd64__)
-#if defined(__amd64__)

-}
-#endif
-#endif
 
 typedef struct pa_atomic {
     volatile unsigned long value;
 } pa_atomic_t;




lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
lib/libpulse-mainloop-glib.so
lib/libpulse-mainloop-glib.so.0
lib/libpulse-mainloop-glib.so.0.0.6
lib/libpulse-simple.so
lib/libpulse-simple.so.0
lib/libpulse-simple.so.0.1.1
lib/libpulse.so
lib/libpulse.so.0
lib/libpulse.so.0.23.0
%%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

share/locale/af/LC_MESSAGES/pulseaudio.mo
share/locale/as/LC_MESSAGES/pulseaudio.mo
share/locale/be/LC_MESSAGES/pulseaudio.mo
share/locale/bg/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/id/LC_MESSAGES/pulseaudio.mo
share/locale/it/LC_MESSAGES/pulseaudio.mo
share/locale/ja/LC_MESSAGES/pulseaudio.mo
share/locale/kk/LC_MESSAGES/pulseaudio.mo
share/locale/kn/LC_MESSAGES/pulseaudio.mo
share/locale/ko/LC_MESSAGES/pulseaudio.mo
share/locale/lt/LC_MESSAGES/pulseaudio.mo

Return to bug 252957

Lines 5-14 Link Here

(-)audio/pulseaudio/Makefile (-7 / +4 lines)
5	# PORTREVISION bumps of depending ports.	5	# PORTREVISION bumps of depending ports.
6		6
7	PORTNAME= pulseaudio	7	PORTNAME= pulseaudio
8	PORTVERSION= 13.0	8	DISTVERSION= 14.2
9	PORTREVISION= 2
10	CATEGORIES= audio	9	CATEGORIES= audio
11	MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/	10	MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/
12		11
13	MAINTAINER= desktop@FreeBSD.org	12	MAINTAINER= desktop@FreeBSD.org
14	COMMENT= Sound server for UNIX	13	COMMENT= Sound server for UNIX
Lines 24-30 Link Here
24	libltdl.so:devel/libltdl \	23	libltdl.so:devel/libltdl \
25	libck-connector.so:sysutils/consolekit2	24	libck-connector.so:sysutils/consolekit2
26		25
27	USES= compiler:c11 cpe gettext gmake gnome iconv libtool \	26	USES= compiler:c11 cpe gettext gmake gnome iconv libtool localbase:ldflags \
28	pathfix pkgconfig python:run shebangfix ssl tar:xz xorg	27	pathfix pkgconfig python:run shebangfix ssl tar:xz xorg
29		28
30	USE_GNOME= glib20	29	USE_GNOME= glib20
Lines 36-43 Link Here
36	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \	35	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
37	LIBS="-lm -lintl" \	36	LIBS="-lm -lintl" \
38	ac_cv_header_linux_input_h=""	37	ac_cv_header_linux_input_h=""
39	CPPFLAGS+= -I${LOCALBASE}/include
40	LDFLAGS+= -L${LOCALBASE}/lib
41	INSTALL_TARGET= install-strip	38	INSTALL_TARGET= install-strip
42		39
43	SHEBANG_FILES= shell-completion/bash/pulseaudio \	40	SHEBANG_FILES= shell-completion/bash/pulseaudio \
Lines 89-95 Link Here
89	SPEEX_CONFIGURE_WITH= speex	86	SPEEX_CONFIGURE_WITH= speex
90	SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp	87	SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp
91	WEBRTC_AEC_DESC= WebRTC-based echo canceller	88	WEBRTC_AEC_DESC= WebRTC-based echo canceller
92	WEBRTC_AEC_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing0	89	WEBRTC_AEC_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing
93	WEBRTC_AEC_CONFIGURE_ENABLE= webrtc-aec	90	WEBRTC_AEC_CONFIGURE_ENABLE= webrtc-aec
94		91
95	OPTIONS_SINGLE= DATABASE	92	OPTIONS_SINGLE= DATABASE

Lines 1-18 Link Here

(-)audio/pulseaudio/files/patch-src_pulsecore_atomic.h (-9 / +9 lines)
1	--- src/pulsecore/atomic.h.orig 2019-09-13 13:10:23 UTC	1	--- src/pulsecore/atomic.h.orig 2020-07-17 12:11:11.000000000 +0200
2	+++ src/pulsecore/atomic.h	2	+++ src/pulsecore/atomic.h 2021-01-23 21:16:28.683759000 +0100
3	@@ -117,7 +117,7 @@ static inline void* pa_atomic_ptr_load(c	3	@@ -117,7 +117,7 @@
4	}	4	}
5		5
6	static inline void pa_atomic_ptr_store(pa_atomic_ptr_t a, void p) {	6	static inline void pa_atomic_ptr_store(pa_atomic_ptr_t a, void p) {
7	- __atomic_store_n(&a->value, p, __ATOMIC_SEQ_CST);	7	- __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST);
8	+ __atomic_store_n(&a->value, (uintptr_t)p, __ATOMIC_SEQ_CST);	8	+ __atomic_store_n(&a->value, (uintptr_t) p, __ATOMIC_SEQ_CST);
9	}	9	}
10		10
11	#else	11	#else
12	@@ -218,39 +218,6 @@ static inline bool pa_atomic_ptr_cmpxchg	12	@@ -217,39 +217,6 @@
		13	#include <sys/types.h>
13	#include <sys/param.h>	14	#include <sys/param.h>
14	#include <machine/atomic.h>	15	#include <machine/atomic.h>
15		16	-
16	-#if __FreeBSD_version < 600000	17	-#if __FreeBSD_version < 600000
17	-#if defined(__i386__) \|\| defined(__amd64__)	18	-#if defined(__i386__) \|\| defined(__amd64__)
18	-#if defined(__amd64__)	19	-#if defined(__amd64__)
Lines 45-51 Link Here
45	-}	46	-}
46	-#endif	47	-#endif
47	-#endif	48	-#endif
48	-	49
49	typedef struct pa_atomic {	50	typedef struct pa_atomic {
50	volatile unsigned long value;	51	volatile unsigned long value;
51	} pa_atomic_t;

Lines 63-75 Link Here

(-)audio/pulseaudio/pkg-plist (-2 / +4 lines)
63	lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake	63	lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
64	lib/libpulse-mainloop-glib.so	64	lib/libpulse-mainloop-glib.so
65	lib/libpulse-mainloop-glib.so.0	65	lib/libpulse-mainloop-glib.so.0
66	lib/libpulse-mainloop-glib.so.0.0.5	66	lib/libpulse-mainloop-glib.so.0.0.6
67	lib/libpulse-simple.so	67	lib/libpulse-simple.so
68	lib/libpulse-simple.so.0	68	lib/libpulse-simple.so.0
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.21.1	72	lib/libpulse.so.0.23.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-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 242-247 Link Here
242	share/locale/af/LC_MESSAGES/pulseaudio.mo	242	share/locale/af/LC_MESSAGES/pulseaudio.mo
243	share/locale/as/LC_MESSAGES/pulseaudio.mo	243	share/locale/as/LC_MESSAGES/pulseaudio.mo
244	share/locale/be/LC_MESSAGES/pulseaudio.mo	244	share/locale/be/LC_MESSAGES/pulseaudio.mo
		245	share/locale/bg/LC_MESSAGES/pulseaudio.mo
245	share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo	246	share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
246	share/locale/ca/LC_MESSAGES/pulseaudio.mo	247	share/locale/ca/LC_MESSAGES/pulseaudio.mo
247	share/locale/cs/LC_MESSAGES/pulseaudio.mo	248	share/locale/cs/LC_MESSAGES/pulseaudio.mo
Lines 261-266 Link Here
261	share/locale/id/LC_MESSAGES/pulseaudio.mo	262	share/locale/id/LC_MESSAGES/pulseaudio.mo
262	share/locale/it/LC_MESSAGES/pulseaudio.mo	263	share/locale/it/LC_MESSAGES/pulseaudio.mo
263	share/locale/ja/LC_MESSAGES/pulseaudio.mo	264	share/locale/ja/LC_MESSAGES/pulseaudio.mo
		265	share/locale/kk/LC_MESSAGES/pulseaudio.mo
264	share/locale/kn/LC_MESSAGES/pulseaudio.mo	266	share/locale/kn/LC_MESSAGES/pulseaudio.mo
265	share/locale/ko/LC_MESSAGES/pulseaudio.mo	267	share/locale/ko/LC_MESSAGES/pulseaudio.mo
266	share/locale/lt/LC_MESSAGES/pulseaudio.mo	268	share/locale/lt/LC_MESSAGES/pulseaudio.mo