Update SDL2 The current one no longer builds on macOS
diff --git a/MODULE.bazel b/MODULE.bazel index 3349374..3e61b42 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -14,9 +14,9 @@ http_archive( name = "sdl2", build_file = "external/sdl2.BUILD", - sha256 = "e6a7c71154c3001e318ba7ed4b98582de72ff970aca05abc9f45f7cbdc9088cb", - strip_prefix = "SDL2-2.0.8", - urls = ["https://www.libsdl.org/release/SDL2-2.0.8.zip"], + sha256 = "91e0b198b08ee61f652e5c914494c5e8b961536b196a803f858c0468454010ea", + strip_prefix = "SDL2-2.32.0", + urls = ["https://www.libsdl.org/release/SDL2-2.32.0.zip"], ) http_archive(
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 43a7ac7..f14484a 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock
@@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "b82dbb23ecead73a68b5ecc90afab91ac9751130d3fd4d017132447dd4c259ce", + "moduleFileHash": "d4a7e5e7cc9bc8d82fc4c0eab1019cbf5062c56f11d0dcf0a434be3474d39fa5", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -44,10 +44,10 @@ "tagName": "@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributeValues": { "build_file": "external/sdl2.BUILD", - "sha256": "e6a7c71154c3001e318ba7ed4b98582de72ff970aca05abc9f45f7cbdc9088cb", - "strip_prefix": "SDL2-2.0.8", + "sha256": "91e0b198b08ee61f652e5c914494c5e8b961536b196a803f858c0468454010ea", + "strip_prefix": "SDL2-2.32.0", "urls": [ - "https://www.libsdl.org/release/SDL2-2.0.8.zip" + "https://www.libsdl.org/release/SDL2-2.32.0.zip" ], "name": "sdl2" }, @@ -2144,10 +2144,10 @@ "ruleClassName": "http_archive", "attributes": { "build_file": "@@//:external/sdl2.BUILD", - "sha256": "e6a7c71154c3001e318ba7ed4b98582de72ff970aca05abc9f45f7cbdc9088cb", - "strip_prefix": "SDL2-2.0.8", + "sha256": "91e0b198b08ee61f652e5c914494c5e8b961536b196a803f858c0468454010ea", + "strip_prefix": "SDL2-2.32.0", "urls": [ - "https://www.libsdl.org/release/SDL2-2.0.8.zip" + "https://www.libsdl.org/release/SDL2-2.32.0.zip" ], "name": "_main~_repo_rules~sdl2" }
diff --git a/external/sdl2.BUILD b/external/sdl2.BUILD index 9c8ed67..a34ae81 100644 --- a/external/sdl2.BUILD +++ b/external/sdl2.BUILD
@@ -23,24 +23,25 @@ objc_library( name = "sdl2_objc", srcs = glob([ - "src/**/*.h", "include/*.h", - ]), - includes = sdl_includes, - non_arc_srcs = glob([ + "src/**/*.h", "src/audio/coreaudio/*.m", "src/file/cocoa/*.m", "src/filesystem/cocoa/*.m", + "src/joystick/iphoneos/*.m", "src/render/metal/*.m", "src/video/cocoa/*.m", ]), + includes = sdl_includes, sdk_frameworks = [ "AudioToolbox", "Carbon", "CoreAudio", + "CoreHaptics", "CoreVideo", "Cocoa", "ForceFeedback", + "GameController", "IOKit", "OpenGL", "Metal", @@ -54,11 +55,27 @@ "src/**/*.h", ], exclude = [ - "src/video/qnx/**", - "src/haptic/windows/**", - "src/test/*.c", - "src/thread/generic/*.c", - "src/core/linux/*.c", + # Exclude non-Mac platforms. + "src/*/android/**", + "src/*/emscripten/**", + "src/*/gdk/**", + "src/*/libusb/**", + "src/*/linux/**", + "src/*/n3ds/**", + "src/*/openbsd/**", + "src/*/os2/**", + "src/*/ps2/**", + "src/*/psp/**", + "src/*/qnx/**", + "src/*/riscos/**", + "src/*/vita/**", + "src/*/windows/**", + "src/*/winrt/**", + # These C files are included as headers. + "src/hidapi/mac/**", + "src/thread/generic/**", + # Exclude tests. + "src/test/**", ], ) @@ -77,7 +94,10 @@ "@com_google_quic_trace//buildenv:linux": ["-lSDL2"], "@com_google_quic_trace//buildenv:osx": [], }), - textual_hdrs = glob(["src/thread/generic/*.c"]), + textual_hdrs = glob([ + "src/hidapi/mac/*.c", + "src/thread/generic/*.c", + ]), visibility = ["//visibility:public"], deps = select({ "@com_google_quic_trace//buildenv:linux": [],