diff options
| author | pastdue <30942300+past-due@users.noreply.github.com> | 2021-04-07 15:31:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 12:31:03 -0700 |
| commit | b3e8d4dc69046c3a9b0aaff9ae9a40aa08d988f1 (patch) | |
| tree | 6e0cbfb6b0d54c330c2cc39548aed6203d4a6a0e | |
| parent | c9ab7da4d468d877bc2edf489cbe9c8d14fc4053 (diff) | |
| download | vcpkg-b3e8d4dc69046c3a9b0aaff9ae9a40aa08d988f1.tar.gz vcpkg-b3e8d4dc69046c3a9b0aaff9ae9a40aa08d988f1.zip | |
[sdl2] Fix pthread detection on macOS (#17106)
* [sdl2] Fix pthread detection on macOS
* Add missing "FEATURES" to vcpkg_check_features
* [sdl2] Bump port-version
* Run x-add-version sdl2
| -rw-r--r-- | ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch | 12 | ||||
| -rw-r--r-- | ports/sdl2/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/sdl2/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/s-/sdl2.json | 5 |
5 files changed, 21 insertions, 2 deletions
diff --git a/ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch b/ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch new file mode 100644 index 000000000..4db047a5f --- /dev/null +++ b/ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake +--- a/cmake/sdlchecks.cmake ++++ b/cmake/sdlchecks.cmake +@@ -847,7 +847,7 @@ macro(CheckPTHREAD) + # Run some tests + set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LDFLAGS}") +- if(CMAKE_CROSSCOMPILING) ++ if(CMAKE_CROSSCOMPILING OR DARWIN) + set(HAVE_PTHREADS 1) + else() + check_c_source_runs(" diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 2bd389c3f..84e57a89d 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0002-sdl2-skip-ibus-on-linux.patch 0003-sdl2-fix-uwp-build.patch + 0004-sdl2-macos-thread-detection-fix.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -19,6 +20,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SDL_SHARED) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES vulkan VIDEO_VULKAN ) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 691875670..f4e9e9c8d 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version-string": "2.0.14", - "port-version": 3, + "port-version": 4, "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": { diff --git a/versions/baseline.json b/versions/baseline.json index b15e28162..c679babf1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5426,7 +5426,7 @@ }, "sdl2": { "baseline": "2.0.14", - "port-version": 3 + "port-version": 4 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index fba093c63..a0ba35556 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "44061d4f51d8cba5625da7b41ef712976d9416e8", + "version-string": "2.0.14", + "port-version": 4 + }, + { "git-tree": "07b3a3a427d35ed4ba0a154d7ff3e34be2f0ddfb", "version-string": "2.0.14", "port-version": 3 |