<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/82a71e3117a006be639b1c9c333f5557d6a92ce2">https://github.com/macports/macports-ports/commit/82a71e3117a006be639b1c9c333f5557d6a92ce2</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 82a71e3117a pulseaudio: Use MacPorts perl and XML::Parser again
</span>82a71e3117a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 82a71e3117a006be639b1c9c333f5557d6a92ce2
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Feb 9 10:26:44 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> pulseaudio: Use MacPorts perl and XML::Parser again
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69171
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Partially reverts a66e323ee48dcb954f60f89803885f3929a1f9c4
</span>---
audio/pulseaudio/Portfile | 13 +++++++++++--
...emon_default.pa.in-skip-consolekit-and-systemdlogin.diff | 6 +++---
...acosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff | 10 +++++-----
...dules_macosx_module_coreaudio_device.c-tiger-compat.diff | 10 +++++-----
audio/pulseaudio/files/perl.patch | 11 +++++++++++
5 files changed, 35 insertions(+), 15 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 1e3ce82c61a..41cb0363a2b 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;'>@@ -7,6 +7,7 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup perl5 1.0
</span>
name pulseaudio
version 17.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +33,12 @@ checksums rmd160 091da3b1d4d7e4ef464cfc53969995d408985bae \
</span> sha256 053794d6671a3e397d849e478a80b82a63cb9d8ca296bd35b73317bb5ceb87b5 \
size 1566556
<span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-xml-parser \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:dbus \
port:fftw-3-single \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,12 +74,17 @@ platform darwin {
</span> # and posts on the mailing list.
patchfiles-append patch-src_modules_macosx_module_coreaudio_device.c-respect-PA_NAME_MAX.diff \
patch-src_daemon_default.pa.in-skip-consolekit-and-systemdlogin.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_pulsecore_shm.c_Static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_pulsecore_shm.c_Static_assert.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perl.patch
</span>
platform darwin 8 {
patchfiles-append patch-src_modules_macosx_module_coreaudio_device.c-tiger-compat.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PERL@|${perl5.bin}|g" ${worksrcpath}/man/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.c_standard 2011
# orc uses stdatomic.h
compiler.blacklist-append {clang < 700}
<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 bb7cc89ac73..7cd1179cce5 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 2018-11-20 08:37:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/daemon/default.pa.in 2019-12-03 02:55:26.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,12 +153,14 @@ load-module module-suspend-on-idle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/daemon/default.pa.in.orig 2024-01-12 11:22:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/daemon/default.pa.in 2024-02-09 10:23:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,12 +144,14 @@
</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_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 63dfe92d256..a974e77269d 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/modules/macosx/module-coreaudio-device.c.old 2019-09-13 15:10:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/macosx/module-coreaudio-device.c 2019-12-03 02:52:49.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/macosx/module-coreaudio-device.c.orig 2024-01-12 11:22:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/macosx/module-coreaudio-device.c 2024-02-09 10:23:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +44,7 @@
</span> #include <pulsecore/thread.h>
#include <pulsecore/thread-mq.h>
#include <pulsecore/i18n.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;'>-@@ -453,7 +454,12 @@ static int ca_device_create_sink(pa_modu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -454,7 +455,12 @@
</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;'>-@@ -587,7 +593,12 @@ static int ca_device_create_source(pa_mo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -588,7 +594,12 @@
</span> tmp = NULL;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-tiger-compat.diff b/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-tiger-compat.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 732d2aa6fc1..11c9367971b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-tiger-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/pulseaudio/files/patch-src_modules_macosx_module_coreaudio_device.c-tiger-compat.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/modules/macosx/module-coreaudio-device.c.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/modules/macosx/module-coreaudio-device.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/modules/macosx/module-coreaudio-device.c.orig 2024-02-09 10:25:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/modules/macosx/module-coreaudio-device.c 2024-02-09 10:25:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span>
struct userdata {
AudioObjectID object_id;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
pa_thread_mq thread_mq;
pa_asyncmsgq *async_msgq;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -885,7 +896,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -896,7 +896,8 @@
</span> pa_log_debug("%u frames per IOProc\n", (unsigned int) frames);
/* create one ioproc for both directions */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> if (err) {
pa_log("AudioDeviceCreateIOProcID() failed (err = %08x\n).", (int) err);
goto fail;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -967,7 +979,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -978,7 +979,7 @@
</span>
if (u->proc_id) {
AudioDeviceStop(u->object_id, u->proc_id);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/perl.patch b/audio/pulseaudio/files/perl.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..52e34b47441
</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/perl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- man/meson.build.orig 2024-01-12 11:22:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ man/meson.build 2024-02-09 10:17:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man_data.set('PACKAGE_BUGREPORT', 'pulseaudio-discuss (at) lists (dot) freedesktop (dot) org')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man_data.set('PA_DEFAULT_CONFIG_DIR', cdata.get_unquoted('PA_DEFAULT_CONFIG_DIR'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-perl = find_program('perl', required: true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++perl = '@PERL@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmltoman_cmd = [perl, join_paths(meson.current_source_dir(), 'xmltoman')]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmllint = find_program('xmllint', required: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>