diff --git a/releases.json b/releases.json index 2cf4cfa7c4..c35d89f789 100644 --- a/releases.json +++ b/releases.json @@ -4178,6 +4178,7 @@ "sdl3" ], "versions": [ + "3.4.2-1", "3.4.0-2", "3.4.0-1", "3.2.10-2", diff --git a/subprojects/packagefiles/sdl3/meson.build b/subprojects/packagefiles/sdl3/meson.build index 36b5db97f3..fd4773141e 100644 --- a/subprojects/packagefiles/sdl3/meson.build +++ b/subprojects/packagefiles/sdl3/meson.build @@ -1,7 +1,7 @@ project( 'sdl3', 'c', - version: '3.4.0', + version: '3.4.2', license: 'zlib', meson_version: '>=1.6', default_options: ['c_std=none'], @@ -418,18 +418,22 @@ elif host_machine.subsystem() == 'macos' sdl_deps += dependency( 'appleframeworks', modules: [ - 'CoreFoundation', + 'AudioToolbox', + 'AVFoundation', + 'Carbon', 'Cocoa', 'CoreAudio', + 'CoreFoundation', 'CoreGraphics', 'CoreHaptics', - 'GameController', + 'CoreMedia', + 'CoreVideo', 'ForceFeedback', - 'IOKit', 'Foundation', - 'QuartzCore', + 'GameController', + 'IOKit', 'Metal', - 'Carbon', + 'QuartzCore', 'UniformTypeIdentifiers', ], ) @@ -473,6 +477,7 @@ sdl_lib = library( sdl3_dep = declare_dependency( include_directories: 'include', link_with: sdl_lib, + dependencies: sdl_deps, ) meson.override_dependency('sdl3', sdl3_dep) diff --git a/subprojects/packagefiles/sdl3/src/audio/meson.build b/subprojects/packagefiles/sdl3/src/audio/meson.build index e988f37376..66bcdc1035 100644 --- a/subprojects/packagefiles/sdl3/src/audio/meson.build +++ b/subprojects/packagefiles/sdl3/src/audio/meson.build @@ -4,6 +4,7 @@ if host_machine.system() == 'windows' subdir('directsound') # subdir('wasapi') elif host_machine.system() == 'darwin' + cdata.set('SDL_AUDIO_DRIVER_COREAUDIO', 1) subdir('coreaudio') else cdata.set('SDL_AUDIO_DRIVER_PIPEWIRE', 1) diff --git a/subprojects/packagefiles/sdl3/src/dialog/cocoa/meson.build b/subprojects/packagefiles/sdl3/src/dialog/cocoa/meson.build index 3b34f0df8c..0473fdcbbd 100644 --- a/subprojects/packagefiles/sdl3/src/dialog/cocoa/meson.build +++ b/subprojects/packagefiles/sdl3/src/dialog/cocoa/meson.build @@ -1 +1 @@ -sources += files() +sources += files('SDL_cocoadialog.m') diff --git a/subprojects/packagefiles/sdl3/src/dialog/meson.build b/subprojects/packagefiles/sdl3/src/dialog/meson.build index b81b2a48ef..142770ef25 100644 --- a/subprojects/packagefiles/sdl3/src/dialog/meson.build +++ b/subprojects/packagefiles/sdl3/src/dialog/meson.build @@ -1,5 +1,7 @@ if host_machine.system() == 'windows' subdir('windows') +elif host_machine.system() == 'darwin' + subdir('cocoa') else subdir('unix') endif diff --git a/subprojects/packagefiles/sdl3/src/filesystem/cocoa/meson.build b/subprojects/packagefiles/sdl3/src/filesystem/cocoa/meson.build index 3b34f0df8c..ee7f9d88e3 100644 --- a/subprojects/packagefiles/sdl3/src/filesystem/cocoa/meson.build +++ b/subprojects/packagefiles/sdl3/src/filesystem/cocoa/meson.build @@ -1 +1 @@ -sources += files() +sources += files('SDL_sysfilesystem.m') diff --git a/subprojects/packagefiles/sdl3/src/filesystem/meson.build b/subprojects/packagefiles/sdl3/src/filesystem/meson.build index c9e31947bc..64241f95b9 100644 --- a/subprojects/packagefiles/sdl3/src/filesystem/meson.build +++ b/subprojects/packagefiles/sdl3/src/filesystem/meson.build @@ -2,6 +2,11 @@ if host_machine.system() == 'windows' cdata.set('SDL_FSOPS_WINDOWS', 1) cdata.set('SDL_FILESYSTEM_WINDOWS', 1) subdir('windows') +elif host_machine.system() == 'darwin' + cdata.set('SDL_FSOPS_POSIX', 1) + cdata.set('SDL_FILESYSTEM_COCOA', 1) + subdir('cocoa') + subdir('posix') else cdata.set('SDL_FSOPS_POSIX', 1) cdata.set('SDL_FILESYSTEM_UNIX', 1) diff --git a/subprojects/packagefiles/sdl3/src/locale/macos/meson.build b/subprojects/packagefiles/sdl3/src/locale/macos/meson.build index 3b34f0df8c..9a32f76edc 100644 --- a/subprojects/packagefiles/sdl3/src/locale/macos/meson.build +++ b/subprojects/packagefiles/sdl3/src/locale/macos/meson.build @@ -1 +1 @@ -sources += files() +sources += files('SDL_syslocale.m') diff --git a/subprojects/packagefiles/sdl3/src/locale/meson.build b/subprojects/packagefiles/sdl3/src/locale/meson.build index dd0b2cfdb0..ba9c30ab64 100644 --- a/subprojects/packagefiles/sdl3/src/locale/meson.build +++ b/subprojects/packagefiles/sdl3/src/locale/meson.build @@ -2,7 +2,9 @@ sources += files('SDL_locale.c') if host_machine.system() == 'windows' subdir('windows') -elif host_machine.system() == 'linux' or host_machine.system() == 'darwin' +elif host_machine.system() == 'darwin' + subdir('macos') +elif host_machine.system() == 'linux' subdir('unix') else error('Platform not supported yet.') diff --git a/subprojects/packagefiles/sdl3/src/misc/macos/meson.build b/subprojects/packagefiles/sdl3/src/misc/macos/meson.build index 3b34f0df8c..c2f0ce9779 100644 --- a/subprojects/packagefiles/sdl3/src/misc/macos/meson.build +++ b/subprojects/packagefiles/sdl3/src/misc/macos/meson.build @@ -1 +1 @@ -sources += files() +sources += files('SDL_sysurl.m') diff --git a/subprojects/packagefiles/sdl3/src/misc/meson.build b/subprojects/packagefiles/sdl3/src/misc/meson.build index 238d85539f..b43c5508ba 100644 --- a/subprojects/packagefiles/sdl3/src/misc/meson.build +++ b/subprojects/packagefiles/sdl3/src/misc/meson.build @@ -1,5 +1,7 @@ if host_machine.system() == 'windows' subdir('windows') +elif host_machine.system() == 'darwin' + subdir('macos') else subdir('unix') endif diff --git a/subprojects/packagefiles/sdl3/src/tray/cocoa/meson.build b/subprojects/packagefiles/sdl3/src/tray/cocoa/meson.build index 3b34f0df8c..fa0ac6d7c8 100644 --- a/subprojects/packagefiles/sdl3/src/tray/cocoa/meson.build +++ b/subprojects/packagefiles/sdl3/src/tray/cocoa/meson.build @@ -1 +1 @@ -sources += files() +sources += files('SDL_tray.m') diff --git a/subprojects/packagefiles/sdl3/src/tray/meson.build b/subprojects/packagefiles/sdl3/src/tray/meson.build index b4a1bad2ef..212bc7cb47 100644 --- a/subprojects/packagefiles/sdl3/src/tray/meson.build +++ b/subprojects/packagefiles/sdl3/src/tray/meson.build @@ -1,5 +1,7 @@ if host_machine.system() == 'windows' subdir('windows') +elif host_machine.system() == 'darwin' + subdir('cocoa') else subdir('unix') endif diff --git a/subprojects/packagefiles/sdl3/src/video/meson.build b/subprojects/packagefiles/sdl3/src/video/meson.build index ed45869d65..c8a4669298 100644 --- a/subprojects/packagefiles/sdl3/src/video/meson.build +++ b/subprojects/packagefiles/sdl3/src/video/meson.build @@ -4,6 +4,7 @@ if host_machine.system() == 'windows' cdata.set('SDL_VIDEO_DRIVER_WINDOWS', 1) subdir('windows') elif host_machine.system() == 'darwin' + cdata.set('SDL_VIDEO_DRIVER_COCOA', 1) subdir('cocoa') else cdata.set('SDL_VIDEO_DRIVER_WAYLAND', 1) diff --git a/subprojects/sdl3.wrap b/subprojects/sdl3.wrap index 71d9bb86bf..0d0210616c 100644 --- a/subprojects/sdl3.wrap +++ b/subprojects/sdl3.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory = SDL3-3.4.0 -source_url = https://github.com/libsdl-org/SDL/releases/download/release-3.4.0/SDL3-3.4.0.tar.gz -source_filename = SDL3-3.4.0.tar.gz -source_hash = 082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8 +directory = SDL3-3.4.2 +source_url = https://github.com/libsdl-org/SDL/releases/download/release-3.4.2/SDL3-3.4.2.tar.gz +source_filename = SDL3-3.4.2.tar.gz +source_hash = ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c patch_directory = sdl3 [provide]