View | Details | Raw Unified | Return to bug 210548 | Differences between
and this patch

Collapse All | Expand All

(-)pulseaudio/Makefile (-18 / +39 lines)
Lines 5-11 Link Here
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-34 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
		pathfix pkgconfig shebangfix tar:xz
33
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
34
CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
32
CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
Lines 45-97 Link Here
45
SUB_FILES=	pkg-message
43
SUB_FILES=	pkg-message
46
44
47
CONFIGURE_ARGS=	--localstatedir=/var \
45
CONFIGURE_ARGS=	--localstatedir=/var \
48
		--with-database=simple \
49
		--without-caps \
46
		--without-caps \
50
		--disable-udev \
47
		--disable-udev \
51
		--disable-gtk3 \
48
		--disable-gtk3 \
52
		--disable-systemd \
49
		--disable-systemd-daemon \
50
		--disable-systemd-journal \
51
		--disable-systemd-login \
53
		--disable-neon-opt \
52
		--disable-neon-opt \
54
		--disable-xen \
53
		--disable-xen \
55
		--disable-lirc # untested
54
		--disable-lirc # untested
56
55
57
#FIXME --with-database=auto|tdb|gdbm|simple
58
59
USERS=		pulse
56
USERS=		pulse
60
GROUPS=		pulse pulse-access pulse-rt
57
GROUPS=		pulse pulse-access pulse-rt
61
58
62
OPTIONS_SUB=	yes
59
OPTIONS_SUB=	yes
63
OPTIONS_DEFINE=	JACK AVAHI GCONF ALSA SIMD BASH ZSH
60
OPTIONS_DEFINE=	AVAHI GCONF SIMD SOXR SPEEX
64
OPTIONS_DEFAULT=AVAHI SIMD
61
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
62
AVAHI_CONFIGURE_ENABLE=	avahi
68
AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
63
AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
69
GCONF_CONFIGURE_ENABLE=	gconf
64
GCONF_CONFIGURE_ENABLE=	gconf
70
GCONF_USE=	GNOME=gconf2
65
GCONF_USE=	GNOME=gconf2
71
ALSA_CONFIGURE_ENABLE=	alsa
72
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
73
SIMD_CONFIGURE_ENABLE=	orc
66
SIMD_CONFIGURE_ENABLE=	orc
74
SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc
67
SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc
68
SOXR_DESC=	With soxr (resampling)
69
SOXR_CONFIGURE_WITH=	soxr
70
SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
71
SPEEX_DESC=	With speex (resampling, AEC)
72
SPEEX_CONFIGURE_WITH=	speex
73
SPEEX_LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
74
75
OPTIONS_GROUP=	AUDIO COMPLETIONS
76
OPTIONS_GROUP_AUDIO=	ALSA JACK
77
OPTIONS_GROUP_COMPLETIONS=	BASH ZSH
78
AUDIO_DESC=	Supported audio
79
COMPLETIONS_DESC=	Programmable completions
80
ALSA_CONFIGURE_ENABLE=	alsa
81
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
82
JACK_CONFIGURE_ENABLE=	jack
83
JACK_LIB_DEPENDS=	libjack.so:audio/jack
75
ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir
84
ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir
76
85
86
OPTIONS_SINGLE=	DATABASE
87
OPTIONS_SINGLE_DATABASE=	TDB GDBM SIMPLE
88
DATABASE_DESC=	Supported database
89
GDBM_DESC=	GNU database manager support
90
GDBM_CONFIGURE_ON=	--with-database=gdbm
91
GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
92
SIMPLE_DESC=	Simple database support
93
SIMPLE_CONFIGURE_ON=	--with-database=simple
94
TDB_DESC=	Trivial database support
95
TDB_CONFIGURE_ON=	--with-database=tdb
96
TDB_LIB_DEPENDS=	libtdb.so:databases/tdb
97
77
PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
98
PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
78
PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
99
PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
79
100
80
post-patch:
101
post-patch:
81
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
102
	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
82
		${WRKSRC}/src/daemon/default.pa.in
103
		${WRKSRC}/src/daemon/default.pa.in
83
	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
104
	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
84
		-e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
105
		-e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
85
		${WRKSRC}/configure
106
		${WRKSRC}/configure
86
107
87
post-install:
108
post-install:
88
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse
109
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse
89
.for ii in default.pa daemon.conf client.conf system.pa
110
.for ii in default.pa daemon.conf client.conf system.pa
90
	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
111
	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
91
		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
112
		${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample
92
.endfor
113
.endfor
93
114
94
post-install-BASH-off:
115
post-install-BASH-off:
95
	@${RM} -rf ${STAGEDIR}${PREFIX}/share/bash-completion
116
	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion
96
117
97
.include <bsd.port.mk>
118
.include <bsd.port.mk>
(-)pulseaudio/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (pulseaudio-8.0.tar.xz) = 690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989
1
SHA256 (pulseaudio-9.0.tar.xz) = c3d3d66b827f18fbe903fe3df647013f09fc1e2191c035be1ee2d82a9e404686
2
SIZE (pulseaudio-8.0.tar.xz) = 1517656
2
SIZE (pulseaudio-9.0.tar.xz) = 1537568
(-)pulseaudio/files/patch-src_Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/Makefile.in.orig	2016-02-01 11:20:44.952568000 +0100
1
--- src/Makefile.in.orig	2016-06-24 23:00:54 UTC
2
+++ src/Makefile.in	2016-02-01 11:22:08.462998000 +0100
2
+++ src/Makefile.in
3
@@ -11042,7 +11042,7 @@
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 \
(-)pulseaudio/files/patch-src_daemon_default.pa.in (-26 lines)
Lines 1-26 Link Here
1
--- src/daemon/default.pa.in.orig	2015-02-12 14:10:35 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
(-)pulseaudio/files/patch-src_modules_module-detect.c (-13 / +3 lines)
Lines 1-16 Link Here
1
--- src/modules/module-detect.c.orig	2010-11-26 01:45:43.000000000 +0100
1
--- src/modules/module-detect.c.orig	2016-05-10 12:28:04 UTC
2
+++ src/modules/module-detect.c	2011-03-03 00:35:10.000000000 +0100
2
+++ src/modules/module-detect.c
3
@@ -50,7 +50,9 @@ PA_MODULE_DESCRIPTION("Detect available 
3
@@ -160,8 +160,7 @@ 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
@@ -161,8 +163,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) {
(-)pulseaudio/files/patch-src_modules_oss_module-oss.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/modules/oss/module-oss.c.orig	2015-08-06 11:39:12.000000000 +0200
1
--- src/modules/oss/module-oss.c.orig	2016-05-03 06:17:39 UTC
2
+++ src/modules/oss/module-oss.c	2015-09-03 13:13:37.953255000 +0200
2
+++ src/modules/oss/module-oss.c
3
@@ -1227,10 +1227,14 @@
3
@@ -1227,10 +1227,14 @@ int pa__init(pa_module*m) {
4
         use_mmap = false;
4
         use_mmap = false;
5
     }
5
     }
6
 
6
 
(-)pulseaudio/files/patch-src_modules_oss_oss-util.c (-3 / +3 lines)
Lines 1-8 Link Here
1
Support 24bit audio see Comment 6 of 
1
Support 24bit audio see Comment 6 of 
2
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567
2
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567
3
3
4
--- src/modules/oss/oss-util.c.orig	2015-02-12 15:10:35.000000000 +0100
4
--- src/modules/oss/oss-util.c.orig	2016-05-03 06:17:39 UTC
5
+++ src/modules/oss/oss-util.c	2015-04-15 14:41:41.512557000 +0200
5
+++ src/modules/oss/oss-util.c
6
@@ -39,6 +39,22 @@
6
@@ -39,6 +39,22 @@
7
 
7
 
8
 #include "oss-util.h"
8
 #include "oss-util.h"
Lines 26-32 Link Here
26
 int pa_oss_open(const char *device, int *mode, int* pcaps) {
26
 int pa_oss_open(const char *device, int *mode, int* pcaps) {
27
     int fd = -1;
27
     int fd = -1;
28
     int caps;
28
     int caps;
29
@@ -164,8 +180,8 @@
29
@@ -164,8 +180,8 @@ int pa_oss_auto_format(int fd, pa_sample
30
         [PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
30
         [PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
31
         [PA_SAMPLE_S32LE] = AFMT_QUERY, /* not supported */
31
         [PA_SAMPLE_S32LE] = AFMT_QUERY, /* not supported */
32
         [PA_SAMPLE_S32BE] = AFMT_QUERY, /* not supported */
32
         [PA_SAMPLE_S32BE] = AFMT_QUERY, /* not supported */
(-)pulseaudio/files/patch-src_pulse_introspect.c (-5 / +5 lines)
Lines 1-11 Link Here
1
--- src/pulse/introspect.c.orig	2008-01-03 20:01:31.000000000 -0500
1
--- src/pulse/introspect.c.orig	2016-05-03 06:17:39 UTC
2
+++ src/pulse/introspect.c	2008-01-03 20:01:39.000000000 -0500
2
+++ src/pulse/introspect.c
3
@@ -26,6 +26,8 @@
3
@@ -22,6 +22,8 @@
4
 #include <config.h>
4
 #include <config.h>
5
 #endif
5
 #endif
6
 
6
 
7
+#include <string.h>
7
+#include <string.h>
8
+
8
+
9
 #include <pulse/context.h>
9
 #include <pulse/context.h>
10
 
10
 #include <pulse/direction.h>
11
 #include <pulsecore/gccmacro.h>
11
 #include <pulse/xmalloc.h>
(-)pulseaudio/files/patch-src_pulse_util.c (-7 / +6 lines)
Lines 1-5 Link Here
1
--- src/pulse/util.c.orig	2015-02-12 09:10:35.000000000 -0500
1
--- src/pulse/util.c.orig	2016-05-03 06:17:39 UTC
2
+++ src/pulse/util.c	2015-06-13 17:15:14.603153000 -0400
2
+++ src/pulse/util.c
3
@@ -30,6 +30,10 @@
3
@@ -30,6 +30,10 @@
4
 #include <time.h>
4
 #include <time.h>
5
 #include <unistd.h>
5
 #include <unistd.h>
Lines 25-39 Link Here
25
 #ifdef __FreeBSD__
25
 #ifdef __FreeBSD__
26
     {
26
     {
27
-        char *rp;
27
-        char *rp;
28
-
28
+        int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()};
29
+        struct kinfo_proc kp;
30
+        size_t sz = sizeof(kp);
31
 
29
-        if ((rp = pa_readlink("/proc/curproc/file"))) {
32
-        if ((rp = pa_readlink("/proc/curproc/file"))) {
30
-            pa_strlcpy(s, pa_path_get_filename(rp), l);
33
-            pa_strlcpy(s, pa_path_get_filename(rp), l);
31
-            pa_xfree(rp);
34
-            pa_xfree(rp);
32
-            return s;
35
-            return s;
33
+        int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()};
34
+        struct kinfo_proc kp;
35
+        size_t sz = sizeof(kp);
36
+
37
+        if (sysctl(mib, 4, &kp, &sz, NULL, 0) == 0)
36
+        if (sysctl(mib, 4, &kp, &sz, NULL, 0) == 0)
38
+        {
37
+        {
39
+          pa_strlcpy(s, kp.ki_comm, l);
38
+          pa_strlcpy(s, kp.ki_comm, l);
(-)pulseaudio/files/patch-src_pulsecore_atomic.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/pulsecore/atomic.h.orig	2015-02-12 15:10:35.000000000 +0100
1
--- src/pulsecore/atomic.h.orig	2016-06-01 10:50:54 UTC
2
+++ src/pulsecore/atomic.h	2015-03-29 15:54:11.161110000 +0200
2
+++ src/pulsecore/atomic.h
3
@@ -185,39 +185,6 @@
3
@@ -185,39 +185,6 @@ static inline bool pa_atomic_ptr_cmpxchg
4
 #include <sys/param.h>
4
 #include <sys/param.h>
5
 #include <machine/atomic.h>
5
 #include <machine/atomic.h>
6
 
6
 
(-)pulseaudio/files/patch-src_pulsecore_shm.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/pulsecore/shm.c.orig	2013-04-14 06:42:35.000000000 +0200
1
--- src/pulsecore/shm.c.orig	2016-06-21 10:58:21 UTC
2
+++ src/pulsecore/shm.c	2013-06-24 17:25:58.000000000 +0200
2
+++ src/pulsecore/shm.c
3
@@ -97,7 +97,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/pkg-plist (-1 / +1 lines)
Lines 69-75 Link Here
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 210548