<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4d5a9a89c4246c19c1dde2530f167ec9c028fa0c">https://github.com/macports/macports-ports/commit/4d5a9a89c4246c19c1dde2530f167ec9c028fa0c</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 4d5a9a89c42 libsdl2: fix build on older systems
</span>4d5a9a89c42 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d5a9a89c4246c19c1dde2530f167ec9c028fa0c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Aug 13 08:23:35 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> libsdl2: fix build on older systems
</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/63360
</span>---
devel/libsdl2/Portfile | 2 +
devel/libsdl2/files/clang_versions.patch | 93 ++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/Portfile b/devel/libsdl2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e608686f9a..0aefc1e5e42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsdl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsdl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,8 @@ distname ${my_name}-${version}
</span> checksums rmd160 82315a0e9562755d9d7d6b958fc6fc478676efe9 \
sha256 65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles clang_versions.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --without-x
build.args V=1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/files/clang_versions.patch b/devel/libsdl2/files/clang_versions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..547fc9eba9a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsdl2/files/clang_versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libsdl-org/SDL/pull/4639
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/libsdl-org/SDL/pull/4640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/SDL_endian.h b/include/SDL_endian.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 205b793579..9f88cb15b8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/SDL_endian.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/SDL_endian.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,7 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \file SDL_endian.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2))) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (_SDL_HAS_BUILTIN(__builtin_bswap16)) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SDL_Swap16(x) __builtin_bswap16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__GNUC__) && defined(__i386__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@ SDL_Swap16(Uint16 x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+-#if (defined(__clang__) && (__clang_major__ > 2 || (__clang_major__ == 2 && __clang_minor__ >= 6))) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (_SDL_HAS_BUILTIN(__builtin_bswap32)) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SDL_Swap32(x) __builtin_bswap32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__GNUC__) && defined(__i386__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +210,7 @@ SDL_Swap32(Uint32 x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+-#if (defined(__clang__) && (__clang_major__ > 2 || (__clang_major__ == 2 && __clang_minor__ >= 6))) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (_SDL_HAS_BUILTIN(__builtin_bswap64)) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SDL_Swap64(x) __builtin_bswap64(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__GNUC__) && defined(__i386__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3732854582..c7f9068170 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/SDL_stdinc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/SDL_stdinc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,6 +115,17 @@ char *alloca();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</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;'>++/**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Check if the compiler supports a given builtin.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Supported by virtually all clang versions and recent gcc. Use this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * instead of checking the clang version if possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __has_builtin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _SDL_HAS_BUILTIN(x) __has_builtin(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _SDL_HAS_BUILTIN(x) 0
</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;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The number of elements in an array.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/audio/SDL_audiocvt.c.orig 2021-08-11 01:45:04.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/audio/SDL_audiocvt.c 2021-08-13 07:29:58.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_AVX_INTRINSICS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined __clang__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if (__clang_major__ < 5) || defined(_MSC_VER) || defined(__SCE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if (!__has_attribute(target)) || defined(_MSC_VER) || defined(__SCE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undef HAVE_AVX_INTRINSICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,11 +113,8 @@ SDL_ConvertStereoToMono(SDL_AudioCVT * c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_AVX_INTRINSICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* MSVC will always accept AVX intrinsics when compiling for x64 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma clang attribute push (__attribute__((target("avx"))), apply_to=function)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC push_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC target("avx")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__clang__) || defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++__attribute__((target("avx")))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Convert from 5.1 to stereo. Average left and right, distribute center, discard LFE. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void SDLCALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -178,11 +175,6 @@ SDL_Convert51ToStereo_AVX(SDL_AudioCVT *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cvt->filters[cvt->filter_index] (cvt, format);
</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 defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma clang attribute pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC pop_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</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;'>+ #if HAVE_SSE_INTRINSICS
</span></pre><pre style='margin:0'>
</pre>