<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/65af687cde9a2832331be96660d6f448b1ca9f83">https://github.com/macports/macports-ports/commit/65af687cde9a2832331be96660d6f448b1ca9f83</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 65af687 audio/pulseaudio: new patch, revbump.
</span>65af687 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 65af687cde9a2832331be96660d6f448b1ca9f83
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Sun Feb 12 06:11:11 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> audio/pulseaudio: new patch, revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The new patch fixes a startup failure due to improper memory handling.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Another patch has been reworked to bypass potential problems later on.
</span>---
audio/pulseaudio/Portfile | 5 ++-
...ule_coreaudio_device.c-fix-memory-handling.diff | 45 ++++++++++++++++++++++
...ule_coreaudio_device.c-respect-PA_NAME_MAX.diff | 10 +++--
3 files changed, 54 insertions(+), 6 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 72cff2d..97689bc 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;'>@@ -9,7 +9,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name pulseaudio
version 10.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> license LGPL-2.1+ AGPL-3+ MIT BSD
categories audio
maintainers ionic openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,8 @@ patchfiles patch-man-Makefile.am.diff \
</span> patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff \
patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff \
patch-src_modules_macosx_module_coreaudio_detect_device.c-add-record-playback-modarg.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_Makefile.am-drop-FlatCarbon-include.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_Makefile.am-drop-FlatCarbon-include.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_modules_macosx_module_coreaudio_device.c-fix-memory-handling.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7a8d149
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-fix-memory-handling.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ src/modules/macosx/module-coreaudio-device.c 2017-02-12 05:52:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -384,8 +384,6 @@ static int ca_sink_set_state(pa_sink *s,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char * CFString_to_cstr(CFStringRef cfstr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *ret = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cfstr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *tmp = CFStringGetCStringPtr(cfstr, kCFStringEncodingUTF8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFIndex n = CFStringGetLength(cfstr) + 1 /* for the terminating NULL */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -415,7 +413,7 @@ static int ca_device_create_sink(pa_modu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ coreaudio_sink *ca_sink;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_sink *sink;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *tmp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_strbuf *strbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioObjectPropertyAddress property_address;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFStringRef tmp_cfstr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -455,6 +453,7 @@ static int ca_device_create_sink(pa_modu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_strbuf_puts(strbuf, tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_xfree(tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Clamp to PA_NAME_MAX and leave a "safety margin" for deduplication
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -552,7 +551,7 @@ static int ca_device_create_source(pa_mo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ coreaudio_source *ca_source;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_source *source;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *tmp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_strbuf *strbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioObjectPropertyAddress property_address;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFStringRef tmp_cfstr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,6 +591,7 @@ static int ca_device_create_source(pa_mo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_strbuf_puts(strbuf, tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pa_xfree(tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* 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 dc65783..fcff94c 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 2016-05-03 08:17:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/macosx/module-coreaudio-device.c 2016-09-27 03:14:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/macosx/module-coreaudio-device.c.old 2017-01-13 04:02:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/macosx/module-coreaudio-device.c 2017-02-12 06:03:28.000000000 +0100
</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;'>-@@ -452,7 +453,11 @@ static int ca_device_create_sink(pa_modu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,7 +453,12 @@ static int ca_device_create_sink(pa_modu
</span> pa_xfree(tmp);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,10 +18,11 @@
</span> + tmp = pa_strbuf_to_string_free(strbuf);
+ ca_sink->name = pa_xstrndup(tmp, PA_NAME_MAX - 20);
+ pa_xfree(tmp);
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp = NULL;
</span>
pa_log_debug("Stream name is >%s<", ca_sink->name);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -585,7 +590,11 @@ static int ca_device_create_source(pa_mo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -585,7 +591,12 @@ static int ca_device_create_source(pa_mo
</span> pa_xfree(tmp);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +32,7 @@
</span> + tmp = pa_strbuf_to_string_free(strbuf);
+ ca_source->name = pa_xstrndup(tmp, PA_NAME_MAX - 20);
+ pa_xfree(tmp);
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp = NULL;
</span>
pa_log_debug("Stream name is >%s<", ca_source->name);
</pre><pre style='margin:0'>
</pre>