<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/971855fa1535d2f0858a063db69488012e72055c">https://github.com/macports/macports-ports/commit/971855fa1535d2f0858a063db69488012e72055c</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 971855fa153 mpd: Fix compilation on below macOS12
</span>971855fa153 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 971855fa1535d2f0858a063db69488012e72055c
</span>Author: Dean M Greer <gcenx83@gmail.com>
AuthorDate: Sun Aug 14 17:45:54 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mpd: Fix compilation on below macOS12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Wrap the relevant macOS12 API calls to the prior names, also blacklist anything below Xcode12 as anything lower is know to fail.
</span>---
audio/mpd/Portfile | 22 ++++++++++-----------
.../mpd/files/wrappers/AudioToolBox/AudioToolbox.h | 23 ++++++++++++++++++++++
audio/mpd/files/wrappers/CoreAudio/CoreAudio.h | 22 +++++++++++++++++++++
3 files changed, 56 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/mpd/Portfile b/audio/mpd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 926442936a5..de6d7a1107d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/mpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/mpd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,17 +26,6 @@ long_description Music Player Daemon (MPD) allows remote access for playing m
</span> console junkie, like frontend options, or restart X often.
homepage https://www.musicpd.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 0.23.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 81749eef69fa544a88607f539519e3169dc152fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 960dcbac717c388f5dcc4fd945e3af19a476f2b15f367e9653d4c7a948768211 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 771992
</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> set branch [join [lrange [split ${version} .] 0 1] .]
master_sites https://www.musicpd.org/download/${name}/${branch}/
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,6 +136,14 @@ configure.args \
</span>
configure.cflags-append -I${prefix}/include
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Wrap the macOS12 functions, may be added into legacy-support see PR49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 21} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend -isystem ${filespath}/wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-prepend -isystem ${filespath}/wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags-prepend -isystem ${filespath}/wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags-prepend -isystem ${filespath}/wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant ffmpeg description {Support for myriad formats (including ALAC) via FFmpeg} {
depends_lib-append path:lib/libavcodec.dylib:ffmpeg
configure.args-replace -Dffmpeg=disabled -Dffmpeg=enabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,6 +249,9 @@ destroot.env-append {*}${configure.env}
</span> # requires support for C++17.
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Won't compile with anything below Xcode12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 1200}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} > 8} {
set mpduser _mpd
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/mpd/files/wrappers/AudioToolBox/AudioToolbox.h b/audio/mpd/files/wrappers/AudioToolBox/AudioToolbox.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cd53af4f4fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/mpd/files/wrappers/AudioToolBox/AudioToolbox.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</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;'>+ * Copyright (c) 2022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Permission to use, copy, modify, and distribute this software for any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * purpose with or without fee is hereby granted, provided that the above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * copyright notice and this permission notice appear in all copies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
</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;'>+#if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 && MAC_OS_X_VERSION_MAX_ALLOWED < 120000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define kAudioHardwareServiceDeviceProperty_VirtualMainVolume kAudioHardwareServiceDeviceProperty_VirtualMasterVolume
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define kAudioHardwareServiceDeviceProperty_VirtualMainBalance kAudioHardwareServiceDeviceProperty_VirtualMasterBalance
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include_next <AudioToolbox/AudioToolbox.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/mpd/files/wrappers/CoreAudio/CoreAudio.h b/audio/mpd/files/wrappers/CoreAudio/CoreAudio.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..489df57c817
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/mpd/files/wrappers/CoreAudio/CoreAudio.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</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;'>+ * Copyright (c) 2022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Permission to use, copy, modify, and distribute this software for any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * purpose with or without fee is hereby granted, provided that the above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * copyright notice and this permission notice appear in all copies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
</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;'>+#if MAC_OS_X_VERSION_MAX_ALLOWED < 120000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include_next <CoreAudio/CoreAudio.h>
</span></pre><pre style='margin:0'>
</pre>