<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/6660fd294369324c9d9be49673d56f92046e1444">https://github.com/macports/macports-ports/commit/6660fd294369324c9d9be49673d56f92046e1444</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6660fd294369324c9d9be49673d56f92046e1444
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Feb 3 16:44:26 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> libsdl2: update to 2.30.12
</span>---
devel/libsdl2/Portfile | 11 ++----
devel/libsdl2/files/NSTimer.patch | 46 -----------------------
devel/libsdl2/files/kAudioChannelLayoutTag.patch | 31 ---------------
devel/libsdl2/files/showAlert.patch | 48 ------------------------
4 files changed, 3 insertions(+), 133 deletions(-)
<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 898a1f8e3b3..c12a3a67641 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;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
name libsdl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libsdl-org SDL 2.30.11 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libsdl-org SDL 2.30.12 release-
</span> categories devel multimedia
platforms macosx freebsd
license zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,8 @@ homepage https://www.libsdl.org/
</span>
github.tarball_from releases
distname SDL2-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8765ed2a88d396008d68a8586abff6fcd9fe6624 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8b8d4aef2038533da814965220f88f77d60dfa0f32685f80ead65e501337da7f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d85b104e90a525fa2eb98aaa3a20c48fdd19ca09 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea
</span>
depends_lib port:libiconv
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,11 +51,6 @@ if {${os.subplatform} eq "macosx" && ${os.major} <= 10} {
</span> } else {
conflicts libsdl2-powerpc libsdl2-snowleopard
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/libsdl-org/SDL/pull/11827
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles showAlert.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSTimer.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kAudioChannelLayoutTag.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform macosx {
# Uses ObjC ARC, which can't be used with the legacy runtime (as
# used on 32-bit) before LLVM 3.8, which is roughly Xcode 7.3.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/files/NSTimer.patch b/devel/libsdl2/files/NSTimer.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4e4ff3a3722..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsdl2/files/NSTimer.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/video/cocoa/SDL_cocoawindow.m.orig 2025-01-02 02:48:45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video/cocoa/SDL_cocoawindow.m 2025-01-03 08:07:25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -741,18 +741,28 @@ - (void)windowDidExpose:(NSNotification *)aNotificatio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)windowDidExpose:(NSNotification *)aNotification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_SendWindowEvent(_data.window, SDL_WINDOWEVENT_EXPOSED, 0, 0);
</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;'>-+- (void)onLiveResizeTimerFire:(id)sender
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SDL_OnWindowLiveResizeUpdate(_data.window);
</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;'>- - (void)windowWillStartLiveResize:(NSNotification *)aNotification
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We'll try to maintain 60 FPS during live resizing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const NSTimeInterval interval = 1.0 / 60.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMethodSignature *invocationSig = [Cocoa_WindowListener
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ instanceMethodSignatureForSelector:@selector(onLiveResizeTimerFire:)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSInvocation *invocation = [NSInvocation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ invocationWithMethodSignature:invocationSig];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [invocation setTarget:self];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [invocation setSelector:@selector(onLiveResizeTimerFire:)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- liveResizeTimer = [NSTimer scheduledTimerWithTimeInterval:interval
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- repeats:TRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- block:^(NSTimer *unusedTimer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDL_OnWindowLiveResizeUpdate(_data.window);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ invocation:invocation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ repeats:TRUE];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSRunLoop currentRunLoop] addTimer:liveResizeTimer forMode:NSRunLoopCommonModes];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/video/cocoa/SDL_cocoawindow.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video/cocoa/SDL_cocoawindow.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,6 +78,7 @@ typedef enum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Window delegate functionality */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -(BOOL) windowShouldClose:(id) sender;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -(void) windowDidExpose:(NSNotification *) aNotification;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+-(void) onLiveResizeTimerFire:(id) sender;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -(void) windowWillStartLiveResize:(NSNotification *)aNotification;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -(void) windowDidEndLiveResize:(NSNotification *)aNotification;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -(void) windowDidMove:(NSNotification *) aNotification;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/files/kAudioChannelLayoutTag.patch b/devel/libsdl2/files/kAudioChannelLayoutTag.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4fc0f6ad5e9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsdl2/files/kAudioChannelLayoutTag.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/audio/coreaudio/SDL_coreaudio.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/audio/coreaudio/SDL_coreaudio.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -880,14 +880,25 @@ static int prepare_audioqueue(_THIS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // L R C LFE Ls Rs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_12;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101500)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 7:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // L R C LFE Cs Ls Rs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_6_1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (@available(macOS 10.15, iOS 13, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_6_1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return SDL_SetError("Unsupported audio channels");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 8:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // L R C LFE Rls Rrs Ls Rs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_7_1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (@available(macOS 10.15, iOS 13, *)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_7_1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return SDL_SetError("Unsupported audio channels");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return SDL_SetError("Unsupported audio channels");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/files/showAlert.patch b/devel/libsdl2/files/showAlert.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a22fe9d9bc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsdl2/files/showAlert.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/video/cocoa/SDL_cocoamessagebox.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video/cocoa/SDL_cocoamessagebox.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSWindow *nswindow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (id)initWithParentWindow:(SDL_Window *)window;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @implementation SDLMessageBoxPresenter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,16 +59,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)showAlert:(NSAlert*)alert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nswindow) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [alert beginSheetModalForWindow:nswindow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([alert respondsToSelector:@selector(beginSheetModalForWindow:completionHandler:)]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [alert beginSheetModalForWindow:nswindow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- completionHandler:^(NSModalResponse returnCode) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [NSApp stopModalWithCode:returnCode];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- clicked = [NSApp runModalForWindow:nswindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [alert beginSheetModalForWindow:nswindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ clicked = [NSApp runModalForWindow:nswindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nswindow = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clicked = [alert runModal];
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (void) alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [NSApp stopModalWithCode:returnCode];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>