<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/bf68f58d4a183a94ccae6dd626842ab4abbcd17d">https://github.com/macports/macports-ports/commit/bf68f58d4a183a94ccae6dd626842ab4abbcd17d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bf68f58d4a183a94ccae6dd626842ab4abbcd17d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Aug 21 07:51:35 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    ffmpeg-devel: libsdl2: support latest versions
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/65703
</span>---
 multimedia/ffmpeg-devel/Portfile                   |  7 +++++-
 .../ffmpeg-devel/files/patch-libsdl2-version.diff  | 25 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 35c3e876d8c..99bc8a176f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ conflicts           ffmpeg ffmpeg-upstream
</span> 
 # Please increase the revision of mpv whenever ffmpeg's version is updated.
 version             4.4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            3
</span> epoch               2
 
 license             LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,6 +110,11 @@ patchfiles-append   patch-libavcodec-videotoolboxenc.c.diff
</span> # Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
 patchfiles-append   patch-issue-9439-non-b-frame-encoding.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for libsdl2; support newer versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/65703
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed via upstream commit: e5163b1d34381a3319214a902ef1df923dd2eeba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-libsdl2-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
 # requires Xcode 3.1 or better on Leopard
 minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libsdl2-version.diff b/multimedia/ffmpeg-devel/files/patch-libsdl2-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2d0e4539159
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-libsdl2-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Source: https://github.com/FFmpeg/FFmpeg/commit/e5163b1d34381a3319214a902ef1df923dd2eeba.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#---------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From e5163b1d34381a3319214a902ef1df923dd2eeba Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Christopher Degawa <ccom@randomderp.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Wed, 11 May 2022 15:11:04 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sdl2 recently changed their versioning, moving the patch level to minor level
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and have said that they will instead ship sdl3.pc for 3.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixes ticket 9768
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6742,7 +6742,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if enabled sdl2; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SDL2_CONFIG="${cross_prefix}sdl2-config"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
</span></pre><pre style='margin:0'>

</pre>