diff options
| author | Jon Spencer <jon@jonspencer.ca> | 2020-11-09 14:52:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 14:52:42 -0800 |
| commit | 6ba00186b11754db7a9a83a0e53cd921dfbd5ca8 (patch) | |
| tree | f9fdc82a68387fb8cc39158133603ead1b4a7b75 /ports | |
| parent | 6b935b7cd3fe230fc0babc66c6b38652f131f7e3 (diff) | |
| download | vcpkg-6ba00186b11754db7a9a83a0e53cd921dfbd5ca8.tar.gz vcpkg-6ba00186b11754db7a9a83a0e53cd921dfbd5ca8.zip | |
[sdl2] apply upstream patch to fix macos vulkan (#14417)
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/sdl2/0008-fix-macos-metal-test.patch | 11 | ||||
| -rw-r--r-- | ports/sdl2/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/sdl2/vcpkg.json | 2 |
3 files changed, 13 insertions, 1 deletions
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 <AvailabilityMacros.h>
+ #import <Metal/Metal.h>
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": { |