<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/7e8a04ba6b71bcebe268224a116b698c39311b2c">https://github.com/macports/macports-ports/commit/7e8a04ba6b71bcebe268224a116b698c39311b2c</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 7e8a04ba6b7 libsdl2: fix build on 10.13 etc
</span>7e8a04ba6b7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e8a04ba6b71bcebe268224a116b698c39311b2c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Nov 24 11:12:10 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> libsdl2: fix build on 10.13 etc
</span>---
devel/libsdl2/Portfile | 3 +-
devel/libsdl2/files/vulkan_metal.h.patch | 91 ++++++++++++++++++++++++++++++++
2 files changed, 93 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 267de30a265..5bba3164e35 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;'>@@ -26,7 +26,8 @@ checksums rmd160 07c571299f7e09b9f93eb4c19f7e0be142e76f98 \
</span>
patchfiles 10.7-sdk-compat.patch \
SDL_mfijoystick.m.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CVDisplayLinkRef.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVDisplayLinkRef.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vulkan_metal.h.patch
</span>
configure.args --without-x \
--disable-jack \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2/files/vulkan_metal.h.patch b/devel/libsdl2/files/vulkan_metal.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1a9fbb436e0
</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/vulkan_metal.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,91 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/video/khronos/vulkan/vulkan_metal.h.orig 2022-11-18 04:16:07.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/video/khronos/vulkan/vulkan_metal.h 2022-11-24 11:01:00.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,14 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef void CAMetalLayer;
</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;'>++#define SDL_UNSAFE_UNRETAINED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__OBJC__) && defined(__has_feature)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __has_feature(objc_arc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef SDL_UNSAFE_UNRETAINED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SDL_UNSAFE_UNRETAINED __unsafe_unretained
</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;'>+ #define VK_EXT_METAL_SURFACE_SPEC_VERSION 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VK_EXT_METAL_SURFACE_EXTENSION_NAME "VK_EXT_metal_surface"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef VkFlags VkMetalSurfaceCreateFlagsEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +41,7 @@ typedef struct VkMetalSurfaceCreateInfoE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkMetalSurfaceCreateFlagsEXT flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const CAMetalLayer* pLayer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const CAMetalLayer SDL_UNSAFE_UNRETAINED *pLayer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkMetalSurfaceCreateInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef VkResult (VKAPI_PTR *PFN_vkCreateMetalSurfaceEXT)(VkInstance instance, const VkMetalSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,27 +119,27 @@ typedef struct VkExportMetalObjectsInfoE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkExportMetalDeviceInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLDevice_id mtlDevice;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLDevice_id SDL_UNSAFE_UNRETAINED mtlDevice;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkExportMetalDeviceInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkExportMetalCommandQueueInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkQueue queue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLCommandQueue_id mtlCommandQueue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLCommandQueue_id SDL_UNSAFE_UNRETAINED mtlCommandQueue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkExportMetalCommandQueueInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkExportMetalBufferInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkDeviceMemory memory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLBuffer_id mtlBuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLBuffer_id SDL_UNSAFE_UNRETAINED mtlBuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkExportMetalBufferInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkImportMetalBufferInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLBuffer_id mtlBuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLBuffer_id SDL_UNSAFE_UNRETAINED mtlBuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkImportMetalBufferInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkExportMetalTextureInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,14 +149,14 @@ typedef struct VkExportMetalTextureInfoE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkImageView imageView;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkBufferView bufferView;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkImageAspectFlagBits plane;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLTexture_id mtlTexture;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLTexture_id SDL_UNSAFE_UNRETAINED mtlTexture;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkExportMetalTextureInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkImportMetalTextureInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkImageAspectFlagBits plane;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLTexture_id mtlTexture;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLTexture_id SDL_UNSAFE_UNRETAINED mtlTexture;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkImportMetalTextureInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkExportMetalIOSurfaceInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,13 +177,13 @@ typedef struct VkExportMetalSharedEventI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkSemaphore semaphore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkEvent event;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLSharedEvent_id mtlSharedEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLSharedEvent_id SDL_UNSAFE_UNRETAINED mtlSharedEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkExportMetalSharedEventInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct VkImportMetalSharedEventInfoEXT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VkStructureType sType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void* pNext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MTLSharedEvent_id mtlSharedEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MTLSharedEvent_id SDL_UNSAFE_UNRETAINED mtlSharedEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } VkImportMetalSharedEventInfoEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef void (VKAPI_PTR *PFN_vkExportMetalObjectsEXT)(VkDevice device, VkExportMetalObjectsInfoEXT* pMetalObjectsInfo);
</span></pre><pre style='margin:0'>
</pre>