chore(deps): update SDL2
This commit is contained in:
parent
88dcb25396
commit
9272f5ef2d
15
meson.build
15
meson.build
|
@ -123,6 +123,7 @@ if not get_option('source-only')
|
||||||
sdl_options += 'use_atomic=enabled'
|
sdl_options += 'use_atomic=enabled'
|
||||||
sdl_options += 'use_threads=enabled'
|
sdl_options += 'use_threads=enabled'
|
||||||
sdl_options += 'use_timers=enabled'
|
sdl_options += 'use_timers=enabled'
|
||||||
|
sdl_options += 'with_main=true'
|
||||||
# investigate if this is truly needed
|
# investigate if this is truly needed
|
||||||
# Do not remove before https://github.com/libsdl-org/SDL/issues/5413 is released
|
# Do not remove before https://github.com/libsdl-org/SDL/issues/5413 is released
|
||||||
sdl_options += 'use_events=enabled'
|
sdl_options += 'use_events=enabled'
|
||||||
|
@ -155,12 +156,24 @@ if not get_option('source-only')
|
||||||
sdl_options += 'use_video_vulkan=disabled'
|
sdl_options += 'use_video_vulkan=disabled'
|
||||||
sdl_options += 'use_video_offscreen=disabled'
|
sdl_options += 'use_video_offscreen=disabled'
|
||||||
sdl_options += 'use_power=disabled'
|
sdl_options += 'use_power=disabled'
|
||||||
|
sdl_options += 'system_iconv=disabled'
|
||||||
|
|
||||||
sdl_dep = dependency('sdl2', fallback: ['sdl2', 'sdl2_dep'],
|
sdl_dep = dependency('sdl2', fallback: ['sdl2', 'sdl2_dep'],
|
||||||
default_options: default_fallback_options + sdl_options
|
default_options: default_fallback_options + sdl_options
|
||||||
)
|
)
|
||||||
|
|
||||||
lite_deps = [lua_dep, sdl_dep, freetype_dep, pcre2_dep, libm, libdl]
|
if host_machine.system() == 'windows'
|
||||||
|
if sdl_dep.type_name() == 'internal'
|
||||||
|
sdlmain_dep = dependency('sdl2main', fallback: ['sdl2main_dep'])
|
||||||
|
else
|
||||||
|
sdlmain_dep = cc.find_library('SDL2main')
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
sdlmain_dep = dependency('', required: false)
|
||||||
|
assert(not sdlmain_dep.found(), 'checking if fake dependency has been found')
|
||||||
|
endif
|
||||||
|
|
||||||
|
lite_deps = [lua_dep, sdl_dep, sdlmain_dep, freetype_dep, pcre2_dep, libm, libdl]
|
||||||
endif
|
endif
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
# Install Configuration
|
# Install Configuration
|
||||||
|
|
|
@ -1,12 +1,15 @@
|
||||||
[wrap-file]
|
[wrap-file]
|
||||||
directory = SDL2-2.26.0
|
directory = SDL2-2.28.1
|
||||||
source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.26.0/SDL2-2.26.0.tar.gz
|
source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz
|
||||||
source_filename = SDL2-2.26.0.tar.gz
|
source_filename = SDL2-2.28.1.tar.gz
|
||||||
source_hash = 8000d7169febce93c84b6bdf376631f8179132fd69f7015d4dadb8b9c2bdb295
|
source_hash = 4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d
|
||||||
patch_filename = sdl2_2.26.0-1_patch.zip
|
patch_filename = sdl2_2.28.1-2_patch.zip
|
||||||
patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.26.0-1/get_patch
|
patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.28.1-2/get_patch
|
||||||
patch_hash = 6fcfd727d71cf7837332723518d5e47ffd64f1e7630681cf4b50e99f2bf7676f
|
patch_hash = 2dd332226ba2a4373c6d4eb29fa915e9d5414cf7bb9fa2e4a5ef3b16a06e2736
|
||||||
wrapdb_version = 2.26.0-1
|
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.28.1-2/SDL2-2.28.1.tar.gz
|
||||||
|
wrapdb_version = 2.28.1-2
|
||||||
|
|
||||||
[provide]
|
[provide]
|
||||||
sdl2 = sdl2_dep
|
sdl2 = sdl2_dep
|
||||||
|
sdl2main = sdl2main_dep
|
||||||
|
sdl2_test = sdl2_test_dep
|
||||||
|
|
Loading…
Reference in New Issue