Skip to content

[sdl2] Fix pthread detection on macOS #17106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 4 commits into from
Apr 7, 2021
Merged

[sdl2] Fix pthread detection on macOS #17106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
536a75c
[sdl2] Fix pthread detection on macOS
past-due Apr 5, 2021
ce7bccd
Add missing "FEATURES" to vcpkg_check_features
past-due Apr 5, 2021
cff2f96
[sdl2] Bump port-version
past-due Apr 5, 2021
ab1b7f1
Run x-add-version sdl2
past-due Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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("
2 changes: 2 additions & 0 deletions ports/sdl2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ 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)
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
)

Expand Down
2 changes: 1 addition & 1 deletion ports/sdl2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5426,7 +5426,7 @@
},
"sdl2": {
"baseline": "2.0.14",
"port-version": 3
"port-version": 4
},
"sdl2-gfx": {
"baseline": "1.0.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "44061d4f51d8cba5625da7b41ef712976d9416e8",
"version-string": "2.0.14",
"port-version": 4
},
{
"git-tree": "07b3a3a427d35ed4ba0a154d7ff3e34be2f0ddfb",
"version-string": "2.0.14",
Expand Down