<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/284a91085cb622e4549f5f82bee80eb6116f7205">https://github.com/macports/macports-ports/commit/284a91085cb622e4549f5f82bee80eb6116f7205</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 284a91085cb libsdl2: build fix for < 10.10
</span>284a91085cb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 284a91085cb622e4549f5f82bee80eb6116f7205
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Nov 27 10:39:30 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> libsdl2: build fix for < 10.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66342
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/libsdl-org/SDL/issues/6586
</span>---
devel/libsdl2/Portfile | 3 ++-
devel/libsdl2/files/openglPixelFormat.diff | 35 ++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
<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 5bba3164e35..a1aa4d0a4e8 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;'>@@ -27,7 +27,8 @@ checksums rmd160 07c571299f7e09b9f93eb4c19f7e0be142e76f98 \
</span> patchfiles 10.7-sdk-compat.patch \
SDL_mfijoystick.m.patch \
CVDisplayLinkRef.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- vulkan_metal.h.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vulkan_metal.h.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openglPixelFormat.diff
</span>
configure.args --without-x \
--disable-jack \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/files/openglPixelFormat.diff b/devel/libsdl2/files/openglPixelFormat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..56218279e74
</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/openglPixelFormat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/video/cocoa/SDL_cocoaopengl.h b/src/video/cocoa/SDL_cocoaopengl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fe8a8e51c134..9330b5744936 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/video/cocoa/SDL_cocoaopengl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/video/cocoa/SDL_cocoaopengl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,6 +59,9 @@ struct SDL_GLDriverData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (SDL_Window*)window;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)explicitUpdate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)dealloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@property (retain, nonatomic) NSOpenGLPixelFormat* openglPixelFormat; // macOS 10.10 has -[NSOpenGLContext pixelFormat] but this handles older OS releases.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* OpenGL functions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/video/cocoa/SDL_cocoaopengl.m b/src/video/cocoa/SDL_cocoaopengl.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 607f30716164..2cdbc17e9f0c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/video/cocoa/SDL_cocoaopengl.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/video/cocoa/SDL_cocoaopengl.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,6 +76,7 @@ - (id)initWithFormat:(NSOpenGLPixelFormat *)format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self = [super initWithFormat:format shareContext:share];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.openglPixelFormat = format;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_AtomicSet(&self->dirty, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self->window = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_AtomicSet(&self->swapIntervalSetting, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +101,7 @@ - (id)initWithFormat:(NSOpenGLPixelFormat *)format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)movedToNewScreen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self->displayLink) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext(self->displayLink, [self CGLContextObj], [[self pixelFormat] CGLPixelFormatObj]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext(self->displayLink, [self CGLContextObj], [[self openglPixelFormat] CGLPixelFormatObj]);
</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;'>+
</span></pre><pre style='margin:0'>
</pre>