From 05b388e3b764075b16a2d240d56629f2b393eef5 Mon Sep 17 00:00:00 2001 From: Takase <20792268+takase1121@users.noreply.github.com> Date: Tue, 18 Jun 2024 21:19:38 +0800 Subject: [PATCH] subprojects: update lua,pcre2,sdl2 (#1812) * subprojects: update lua,pcre2,sdl2 * meson.build: remove hidapi usage * subprojects/sdl2: fix compilation with xinput Co-authored-by: Guldoman --------- Co-authored-by: Guldoman --- meson.build | 1 + subprojects/lua.wrap | 10 +++++----- subprojects/pcre2.wrap | 18 +++++++++--------- subprojects/sdl2.wrap | 18 +++++++++--------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/meson.build b/meson.build index 023507ec..cde60995 100644 --- a/meson.build +++ b/meson.build @@ -153,6 +153,7 @@ if not get_option('source-only') sdl_options += 'use_audio=disabled' sdl_options += 'use_cpuinfo=disabled' sdl_options += 'use_joystick=disabled' + sdl_options += 'use_joystick_xinput=disabled' sdl_options += 'use_video_vulkan=disabled' sdl_options += 'use_video_offscreen=disabled' sdl_options += 'use_power=disabled' diff --git a/subprojects/lua.wrap b/subprojects/lua.wrap index 16502616..a1ffdaf3 100644 --- a/subprojects/lua.wrap +++ b/subprojects/lua.wrap @@ -3,11 +3,11 @@ directory = lua-5.4.6 source_url = https://www.lua.org/ftp/lua-5.4.6.tar.gz source_filename = lua-5.4.6.tar.gz source_hash = 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 -patch_filename = lua_5.4.6-3_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/lua_5.4.6-3/get_patch -patch_hash = 9b72a95422fd47f79f969d9abdb589ee95712d5512a5246f94e7e4f63d2cb7b7 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/lua_5.4.6-3/lua-5.4.6.tar.gz -wrapdb_version = 5.4.6-3 +patch_filename = lua_5.4.6-4_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/lua_5.4.6-4/get_patch +patch_hash = b5a8c9b3673fbe58afaf842041bc9551f1f742c363fd3be8d47db2e6a483b54c +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/lua_5.4.6-4/lua-5.4.6.tar.gz +wrapdb_version = 5.4.6-4 [provide] lua-5.4 = lua_dep diff --git a/subprojects/pcre2.wrap b/subprojects/pcre2.wrap index 6bfef6f3..73b727ec 100644 --- a/subprojects/pcre2.wrap +++ b/subprojects/pcre2.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = pcre2-10.42 -source_url = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 -source_filename = pcre2-10.42.tar.bz2 -source_hash = 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 -patch_filename = pcre2_10.42-5_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.42-5/get_patch -patch_hash = 7ba1730a3786c46f41735658a9884b09bc592af3840716e0ccc552e7ddf5630c -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/pcre2_10.42-5/pcre2-10.42.tar.bz2 -wrapdb_version = 10.42-5 +directory = pcre2-10.44 +source_url = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.tar.bz2 +source_filename = pcre2-10.44.tar.bz2 +source_hash = d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96 +patch_filename = pcre2_10.44-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.44-1/get_patch +patch_hash = 947ee4d309302024f780a5839e779674309c94c05bb5a0618d201979b424002f +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/pcre2_10.44-1/pcre2-10.44.tar.bz2 +wrapdb_version = 10.44-1 [provide] libpcre2-8 = libpcre2_8 diff --git a/subprojects/sdl2.wrap b/subprojects/sdl2.wrap index 14c18533..ae308d73 100644 --- a/subprojects/sdl2.wrap +++ b/subprojects/sdl2.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = SDL2-2.28.1 -source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz -source_filename = SDL2-2.28.1.tar.gz -source_hash = 4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d -patch_filename = sdl2_2.28.1-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.28.1-2/get_patch -patch_hash = 2dd332226ba2a4373c6d4eb29fa915e9d5414cf7bb9fa2e4a5ef3b16a06e2736 -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 +directory = SDL2-2.30.3 +source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz +source_filename = SDL2-2.30.3.tar.gz +source_hash = 820440072f8f5b50188c1dae104f2ad25984de268785be40c41a099a510f0aec +patch_filename = sdl2_2.30.3-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.30.3-2/get_patch +patch_hash = 2c08bde67b3896db88e01481c379322625ea6c928cdb68ead91d0e3749863bc2 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.30.3-2/SDL2-2.30.3.tar.gz +wrapdb_version = 2.30.3-2 [provide] sdl2 = sdl2_dep