From 6ba00186b11754db7a9a83a0e53cd921dfbd5ca8 Mon Sep 17 00:00:00 2001 From: Jon Spencer Date: Mon, 9 Nov 2020 14:52:42 -0800 Subject: [sdl2] apply upstream patch to fix macos vulkan (#14417) --- ports/sdl2/0008-fix-macos-metal-test.patch | 11 +++++++++++ ports/sdl2/portfile.cmake | 1 + ports/sdl2/vcpkg.json | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 ports/sdl2/0008-fix-macos-metal-test.patch diff --git a/ports/sdl2/0008-fix-macos-metal-test.patch b/ports/sdl2/0008-fix-macos-metal-test.patch new file mode 100644 index 000000000..a1d781101 --- /dev/null +++ b/ports/sdl2/0008-fix-macos-metal-test.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2020-11-05 16:48:40.000000000 -0800 ++++ CMakeLists.txt 2020-11-05 16:49:02.000000000 -0800 +@@ -1701,7 +1701,7 @@ + + if(VIDEO_VULKAN OR VIDEO_METAL OR RENDER_METAL) + set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) +- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -x objective-c") ++ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -ObjC") + check_c_source_compiles(" + #include + #import diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index fce7912da..e1c027bf7 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex( fix-EventToken-header-reference.patch 0006-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0007-sdl2-skip-ibus-on-linux.patch + 0008-fix-macos-metal-test.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index ed7c6293a..e05f94106 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version-string": "2.0.12", - "port-version": 6, + "port-version": 7, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "features": { -- cgit v1.2.3