sdl3: update to 3.4.2, fix macOS platform routing#2726
Open
TommyLau wants to merge 1 commit intomesonbuild:masterfrom
Open
sdl3: update to 3.4.2, fix macOS platform routing#2726TommyLau wants to merge 1 commit intomesonbuild:masterfrom
TommyLau wants to merge 1 commit intomesonbuild:masterfrom
Conversation
Update SDL3 from 3.4.0 to 3.4.2. Fix macOS issues in the meson build port: - Add missing SDL_AUDIO_DRIVER_COREAUDIO define for macOS - Add missing SDL_VIDEO_DRIVER_COCOA define for macOS - Add missing frameworks: AudioToolbox, AVFoundation, CoreMedia, CoreVideo - Fix declare_dependency to propagate framework deps (required for static linking) - Fix 5 subsystem routing where macOS fell into Linux else branch: filesystem (cocoa/ not unix/), dialog (cocoa/ not unix/), misc (macos/ not unix/), locale (macos/ not unix/), tray (cocoa/ not unix/) - Populate empty subdirectory meson.build files with correct .m source files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Update SDL3 from 3.4.0 to 3.4.2 and fix multiple macOS build issues.
Version upgrade (3.4.0 → 3.4.2)
sdl3.wrapsource URL, hash, and directoryproject()version inmeson.buildgit diff --diff-filter=ADR)SDL_build_config.h.cmaketemplate unchanged (453 cmakedefines, identical)macOS bug fixes
Missing config defines:
SDL_AUDIO_DRIVER_COREAUDIOinsrc/audio/meson.build(macOS audio was broken)SDL_VIDEO_DRIVER_COCOAinsrc/video/meson.build(macOS video driver not recognized)Missing Apple frameworks:
AudioToolbox,AVFoundation,CoreMedia,CoreVideotoappleframeworks(caused linker errors:_AudioQueueAllocateBufferetc.)Static library dependency propagation:
dependencies: sdl_depstodeclare_dependency()so framework deps propagate when linking staticallyPlatform routing (5 subsystems):
Multiple
src/*/meson.buildfiles only hadif windows / elsebranches, causing macOS (darwin) to fall into the Linuxelsebranch with wrong backends:src/filesystem/unix/cocoa/+posix/src/dialog/unix/(Zenity)cocoa/(native)src/misc/unix/(xdg-open)macos/(NSWorkspace)src/locale/unix/macos/(NSLocale)src/tray/unix/cocoa/(native)Also populated 5 empty subdirectory
meson.buildfiles with correct.msource files:src/filesystem/cocoa/meson.build→SDL_sysfilesystem.msrc/dialog/cocoa/meson.build→SDL_cocoadialog.msrc/misc/macos/meson.build→SDL_sysurl.msrc/locale/macos/meson.build→SDL_syslocale.msrc/tray/cocoa/meson.build→SDL_tray.mTesting
meson setup builddir -Dwraps=sdl3 && meson compile -C builddirpasses (196/196)python3 tools/sanity_checks.pypasses (4 tests OK)