<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/554378d58d6de821cb48bb4d36463bae02ac19f3">https://github.com/macports/macports-ports/commit/554378d58d6de821cb48bb4d36463bae02ac19f3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 554378d58d6de821cb48bb4d36463bae02ac19f3
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Aug 14 05:00:30 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> libsdl2_mixer: backport upstream fix for build with gcc
</span>---
audio/libsdl2_mixer/Portfile | 5 +-
.../a2c6c892aae6b28bbb03adc1bb5ffe32f1eea17e.patch | 62 ++++++++++++++++++++++
2 files changed, 66 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libsdl2_mixer/Portfile b/audio/libsdl2_mixer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c77a9a40638..0281d794e3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libsdl2_mixer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libsdl2_mixer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,9 @@ depends_lib port:libsdl2 \
</span> port:opusfile \
port:wavpack
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/libsdl-org/SDL_mixer/commit/a2c6c892aae6b28bbb03adc1bb5ffe32f1eea17e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles a2c6c892aae6b28bbb03adc1bb5ffe32f1eea17e.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-sdltest \
--disable-music-gme \
--disable-music-midi-fluidsynth \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +35,7 @@ configure.args --disable-sdltest \
</span> --disable-music-opus-shared \
--disable-music-wavpack-shared
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc* { clang < 211 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist *gcc-4.* { clang < 211 }
</span>
post-destroot {
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libsdl2_mixer/files/a2c6c892aae6b28bbb03adc1bb5ffe32f1eea17e.patch b/audio/libsdl2_mixer/files/a2c6c892aae6b28bbb03adc1bb5ffe32f1eea17e.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2b8e89a2464
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libsdl2_mixer/files/a2c6c892aae6b28bbb03adc1bb5ffe32f1eea17e.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a2c6c892aae6b28bbb03adc1bb5ffe32f1eea17e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 03:47:43 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Unbreak build with gcc on macOS
</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;'>+ src/codecs/music_opus.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/codecs/music_wavpack.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/codecs/music_xmp.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/codecs/music_opus.c b/src/codecs/music_opus.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ce394445..58ae3308 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/codecs/music_opus.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/codecs/music_opus.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,11 +60,11 @@ static opus_loader opus;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (opus.FUNC == NULL) { Mix_SetError("Missing opus.framework"); return -1; }
</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;'>+-static int OPUS_Load(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Need to turn off optimizations so weak framework load check works */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __attribute__ ((optnone))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int OPUS_Load(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (opus.loaded == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef OPUS_DYNAMIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/codecs/music_wavpack.c b/src/codecs/music_wavpack.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fc9a1042..60d6f8c2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/codecs/music_wavpack.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/codecs/music_wavpack.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,11 +96,11 @@ static wavpack_loader wvpk;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (wvpk.FUNC == NULL) { Mix_SetError("Missing wavpack.framework"); return -1; }
</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;'>+-static int WAVPACK_Load(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Need to turn off optimizations so weak framework load check works */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __attribute__ ((optnone))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int WAVPACK_Load(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (wvpk.loaded == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WAVPACK_DYNAMIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/codecs/music_xmp.c b/src/codecs/music_xmp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3aeaf9c2..93a8632a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/codecs/music_xmp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/codecs/music_xmp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,11 +76,11 @@ static xmp_loader libxmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (libxmp.FUNC == NULL) { Mix_SetError("Missing xmp.framework"); return -1; }
</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;'>+-static int XMP_Load(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Need to turn off optimizations so weak framework load check works */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __attribute__ ((optnone))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int XMP_Load(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (libxmp.loaded == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XMP_DYNAMIC
</span></pre><pre style='margin:0'>
</pre>