<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36561f6e1c80a9d84f17be356f2e1425313ee9d7">https://github.com/macports/macports-ports/commit/36561f6e1c80a9d84f17be356f2e1425313ee9d7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 36561f6 audio/pulseaudio: update to v12.1, remove obsolete patchfiles.
</span>36561f6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 36561f6e1c80a9d84f17be356f2e1425313ee9d7
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Tue Jul 17 06:49:11 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> audio/pulseaudio: update to v12.1, remove obsolete patchfiles.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/56719
</span>---
audio/pulseaudio/Portfile | 16 +--
audio/pulseaudio/files/i386.patch | 60 ----------
audio/pulseaudio/files/patch-man-Makefile.am.diff | 6 +-
...ch-src_Makefile.am-drop-FlatCarbon-include.diff | 11 --
...ult.pa.in-skip-consolekit-and-systemdlogin.diff | 6 +-
...detect_device.c-add-record-playback-modarg.diff | 130 ---------------------
...ule_coreaudio_device.c-fix-memory-handling.diff | 45 -------
...ule_coreaudio_device.c-respect-PA_NAME_MAX.diff | 8 +-
8 files changed, 18 insertions(+), 264 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/Portfile b/audio/pulseaudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a7e558..13f1aac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/pulseaudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
name pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 11.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 12.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license LGPL-2.1+ AGPL-3+ MIT BSD
categories audio
maintainers {ionic @Ionic} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,9 @@ master_sites https://www.freedesktop.org/software/${name}/releases/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bb625751165be83c3ff4cbb0b22c5a28007e61fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1648924
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 33b3c334c7543592fdf4526f9a5e40988085235f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5f5dfb5e2c376e8c974b80f93b983ed77088ade7fb8b9325a575c45aa35977f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1663204
</span>
set perl_branch 5.26
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,7 @@ depends_build port:pkgconfig \
</span> port:autoconf \
port:automake \
port:libtool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span> port:p${perl_branch}-xml-parser
depends_lib port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +75,8 @@ platform darwin {
</span> # C.f. https://bugs.freedesktop.org/show_bug.cgi?id=62987
# and posts on the mailing list.
patchfiles patch-man-Makefile.am.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- i386.patch \
</span> patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_modules_macosx_module_coreaudio_detect_device.c-add-record-playback-modarg.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +103,7 @@ configure.args --with-mac-version-min=$macosx_deployment_target \
</span> --disable-waveout \
--disable-avahi \
--disable-gconf \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gsettings \
</span> --disable-jack \
--disable-asyncns \
--disable-tcpwrap \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/i386.patch b/audio/pulseaudio/files/i386.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a348ef7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/i386.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,60 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pulsecore/svolume_mmx.c.old 2015-04-17 00:47:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pulsecore/svolume_mmx.c 2015-04-17 00:53:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "sample-util.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* in s: 2 int16_t samples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * in v: 2 int32_t volumes, fixed point 16:16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * out s: contains scaled and clamped int16_t samples.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,15 +238,15 @@ static void pa_volume_s16re_mmx(int16_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_log_info("Initialising MMX optimized volume functions.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_mmx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_mmx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pulsecore/svolume_sse.c.old 2015-04-17 00:47:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pulsecore/svolume_sse.c 2015-04-17 00:54:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "sample-util.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VOLUME_32x16(s,v) /* .. | vh | vl | */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " pxor %%xmm4, %%xmm4 \n\t" /* .. | 0 | 0 | */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -249,15 +249,15 @@ static void pa_volume_s16re_sse2(int16_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (flags & PA_CPU_X86_SSE2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_log_info("Initialising SSE2 optimized volume functions.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_sse2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_sse2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/patch-man-Makefile.am.diff b/audio/pulseaudio/files/patch-man-Makefile.am.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c92295c..6943541 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/patch-man-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/pulseaudio/files/patch-man-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- man/Makefile.am.old 2015-09-10 06:51:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ man/Makefile.am 2016-02-22 20:59:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,7 +57,7 @@ CLEANFILES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- man/Makefile.am.old 2018-07-13 21:06:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ man/Makefile.am 2018-07-17 06:32:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@ CLEANFILES = \
</span> $(dist_man_MANS)
%: %.xml Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/patch-src_Makefile.am-drop-FlatCarbon-include.diff b/audio/pulseaudio/files/patch-src_Makefile.am-drop-FlatCarbon-include.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 130e22c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/patch-src_Makefile.am-drop-FlatCarbon-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am.old 2017-01-13 04:02:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2017-02-11 06:02:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -785,8 +785,6 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pulsecore/mutex-posix.c pulsecore/mutex.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pulsecore/thread-posix.c pulsecore/thread.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pulsecore/semaphore-osx.c pulsecore/semaphore.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += "-I/Developer/Headers/FlatCarbon/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += "-framework CoreServices"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else !OS_IS_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pulsecore/mutex-posix.c pulsecore/mutex.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff b/audio/pulseaudio/files/patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 17f6f5c..411ced0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/daemon/default.pa.in.old 2016-05-03 08:17:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/daemon/default.pa.in 2016-09-27 03:23:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,12 +140,14 @@ load-module module-suspend-on-idle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/daemon/default.pa.in.old 2018-07-13 21:06:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/daemon/default.pa.in 2018-07-17 06:41:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,12 +153,14 @@ load-module module-suspend-on-idle
</span>
### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_detect_device.c-add-record-playback-modarg.diff b/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_detect_device.c-add-record-playback-modarg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 929e0c2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_detect_device.c-add-record-playback-modarg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,130 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/modules/macosx/module-coreaudio-detect.c.old 2017-09-18 12:41:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/macosx/module-coreaudio-detect.c 2017-11-05 12:33:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,10 +39,14 @@ PA_MODULE_AUTHOR("Daniel Mack");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_MODULE_DESCRIPTION("CoreAudio device detection");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_MODULE_VERSION(PACKAGE_VERSION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_MODULE_LOAD_ONCE(true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PA_MODULE_USAGE("ioproc_frames=<passed on to module-coreaudio-device> ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PA_MODULE_USAGE("ioproc_frames=<passed on to module-coreaudio-device> "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "record=<enable source?> "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "playback=<enable sink?> ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char* const valid_modargs[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "ioproc_frames",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "record",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "playback",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,6 +62,8 @@ struct userdata {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int detect_fds[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_io_event *detect_io;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int ioproc_frames;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool record;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool playback;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_LLIST_HEAD(ca_device, devices);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,9 +93,9 @@ static int ca_device_added(struct pa_mod
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (u->ioproc_frames)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- args = pa_sprintf_malloc("object_id=%d ioproc_frames=%d", (int) id, u->ioproc_frames);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args = pa_sprintf_malloc("object_id=%d ioproc_frames=%d record=%d playback=%d", (int) id, u->ioproc_frames, (int) u->record, (int) u->playback);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- args = pa_sprintf_malloc("object_id=%d", (int) id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args = pa_sprintf_malloc("object_id=%d record=%d playback=%d", (int) id, (int) u->record, (int) u->playback);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_log_debug("Loading %s with arguments '%s'", DEVICE_MODULE_NAME, args);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mod = pa_module_load(m->core, DEVICE_MODULE_NAME, args);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,6 +218,7 @@ int pa__init(pa_module *m) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_modargs *ma;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_assert(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pa_assert(m->core);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m->userdata = u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,6 +227,23 @@ int pa__init(pa_module *m) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Set default value to true if not given as a modarg.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * In such a case, pa_modargs_get_value_boolean() will not touch the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * buffer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ u->playback = u->record = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pa_modargs_get_value_boolean(ma, "record", &u->record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &u->playback) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pa_log("record= and playback= expect boolean argument.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!u->playback && !u->record) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pa_log("neither playback nor record enabled for device.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_modargs_get_value_u32(ma, "ioproc_frames", &u->ioproc_frames);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- property_address.mSelector = kAudioHardwarePropertyDevices;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/modules/macosx/module-coreaudio-device.c.old 2017-11-05 12:28:30.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/macosx/module-coreaudio-device.c 2017-11-05 12:33:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,11 +58,15 @@ PA_MODULE_DESCRIPTION("CoreAudio device"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_MODULE_VERSION(PACKAGE_VERSION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_MODULE_LOAD_ONCE(false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_MODULE_USAGE("object_id=<the CoreAudio device id> "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "ioproc_frames=<audio frames per IOProc call> ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "ioproc_frames=<audio frames per IOProc call> "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "record=<enable source?> "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "playback=<enable sink?> ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char* const valid_modargs[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "object_id",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "ioproc_frames",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "record",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "playback",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -768,6 +772,7 @@ int pa__init(pa_module *m) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UInt32 size, frames;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct userdata *u = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_modargs *ma = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool record = true, playback = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char tmp[64];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_card_new_data card_new_data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_card_profile *p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -782,6 +787,16 @@ int pa__init(pa_module *m) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &playback) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pa_log("record= and playback= expect boolean argument.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!playback && !record) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pa_log("neither playback nor record enabled for device.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u = pa_xnew0(struct userdata, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u->module = m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m->userdata = u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -853,10 +868,12 @@ int pa__init(pa_module *m) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PA_LLIST_HEAD_INIT(coreaudio_sink, u->sinks);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* create sinks */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ca_device_create_streams(m, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (playback)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ca_device_create_streams(m, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* create sources */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ca_device_create_streams(m, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (record)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ca_device_create_streams(m, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* create the message thread */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(u->thread = pa_thread_new(u->device_name, thread_func, u))) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-fix-memory-handling.diff b/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-fix-memory-handling.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7a8d149..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-fix-memory-handling.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/modules/macosx/module-coreaudio-device.c.old 2017-02-12 05:50:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/macosx/module-coreaudio-device.c 2017-02-12 05:52:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -384,8 +384,6 @@ static int ca_sink_set_state(pa_sink *s,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char * CFString_to_cstr(CFStringRef cfstr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *ret = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (cfstr != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *tmp = CFStringGetCStringPtr(cfstr, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFIndex n = CFStringGetLength(cfstr) + 1 /* for the terminating NULL */;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -415,7 +413,7 @@ static int ca_device_create_sink(pa_modu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- coreaudio_sink *ca_sink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_sink *sink;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *tmp = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_strbuf *strbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AudioObjectPropertyAddress property_address;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFStringRef tmp_cfstr = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -455,6 +453,7 @@ static int ca_device_create_sink(pa_modu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_strbuf_puts(strbuf, tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_xfree(tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Clamp to PA_NAME_MAX and leave a "safety margin" for deduplication
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -552,7 +551,7 @@ static int ca_device_create_source(pa_mo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- coreaudio_source *ca_source;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_source *source;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *tmp = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_strbuf *strbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AudioObjectPropertyAddress property_address;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFStringRef tmp_cfstr = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -592,6 +591,7 @@ static int ca_device_create_source(pa_mo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_strbuf_puts(strbuf, tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pa_xfree(tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Clamp to PA_NAME_MAX and leave a "safety margin" for deduplication
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff b/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f17d71..bcf9ef2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/modules/macosx/module-coreaudio-device.c.old 2017-09-05 11:33:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/macosx/module-coreaudio-device.c 2017-11-05 12:28:30.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/macosx/module-coreaudio-device.c.old 2018-07-14 18:02:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/macosx/module-coreaudio-device.c 2018-07-17 06:40:04.000000000 +0200
</span> @@ -43,6 +43,7 @@
#include <pulsecore/thread.h>
#include <pulsecore/thread-mq.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span>
#include <CoreAudio/CoreAudio.h>
#include <CoreAudio/CoreAudioTypes.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -451,7 +452,12 @@ static int ca_device_create_sink(pa_modu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -453,7 +454,12 @@ static int ca_device_create_sink(pa_modu
</span> tmp = NULL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span>
pa_log_debug("Stream name is >%s<", ca_sink->name);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -585,7 +591,12 @@ static int ca_device_create_source(pa_mo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -587,7 +593,12 @@ static int ca_device_create_source(pa_mo
</span> tmp = NULL;
}
</pre><pre style='margin:0'>
</pre>