<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/44fefdc4cfbddcabfab8e7cc1598dc6899821ed5">https://github.com/macports/macports-ports/commit/44fefdc4cfbddcabfab8e7cc1598dc6899821ed5</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 44fefdc4cfb pulseaudio: Use MacPorts m4
</span>44fefdc4cfb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 44fefdc4cfbddcabfab8e7cc1598dc6899821ed5
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 17 03:07:39 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> pulseaudio: Use MacPorts m4
</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/69745
</span>---
audio/pulseaudio/Portfile | 16 +++++++++++++---
audio/pulseaudio/files/perl.patch | 11 -----------
2 files changed, 13 insertions(+), 14 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 41cb0363a2b..de17d710388 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;'>@@ -37,6 +37,7 @@ perl5.branches 5.34
</span>
depends_build-append \
port:gettext \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:m4 \
</span> port:p${perl5.major}-xml-parser \
path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,15 +75,24 @@ 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:#ffe0e0;'>- perl.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_pulsecore_shm.c_Static_assert.diff
</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;'>+set meson_config ${workpath}/meson_config.ini
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --native-file ${meson_config}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PERL@|${perl5.bin}|g" ${worksrcpath}/man/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: Generalize this in the meson portgroup.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${meson_config} w]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} {[binaries]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} "m4='${prefix}/bin/gm4'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} "perl='${perl5.bin}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span> }
compiler.c_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/pulseaudio/files/perl.patch b/audio/pulseaudio/files/perl.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 52e34b47441..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/pulseaudio/files/perl.patch
</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;'>---- man/meson.build.orig 2024-01-12 11:22:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ man/meson.build 2024-02-09 10:17:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man_data.set('PACKAGE_BUGREPORT', 'pulseaudio-discuss (at) lists (dot) freedesktop (dot) org')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man_data.set('PA_DEFAULT_CONFIG_DIR', cdata.get_unquoted('PA_DEFAULT_CONFIG_DIR'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--perl = find_program('perl', required: true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+perl = '@PERL@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmltoman_cmd = [perl, join_paths(meson.current_source_dir(), 'xmltoman')]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmllint = find_program('xmllint', required: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>