Merge pull request #211 from OpenBrickProtocolFoundation/update_wraps

Totto16 · web-flow · commit eced13c40d8d · 2025-02-17T03:58:30.000+01:00
Update wraps
diff --git a/platforms/emscripten/sdl2_image_port.diff b/platforms/emscripten/sdl2_image_port.diff
@@ -1,5 +1,5 @@
 diff --git a/tools/ports/sdl2_image.py b/tools/ports/sdl2_image.py
-index 70fa1499..36be807b 100644
+index 7a7d0aa..145bc6d 100644
 --- a/tools/ports/sdl2_image.py
 +++ b/tools/ports/sdl2_image.py
 @@ -18,7 +18,8 @@ variants = {
@@ -29,27 +29,27 @@ index 70fa1499..36be807b 100644
 -  if settings.PTHREADS:
 +  if settings.PTHREADS or opts['mt']:
      libname += '-mt'
-   return libname + '.a'
- 
-@@ -75,7 +77,7 @@ def get(ports, settings, shared):
+   if settings.SUPPORT_LONGJMP == 'wasm':
+     libname += '-wasm-sjlj'
+@@ -76,7 +78,7 @@ def get(ports, settings, shared):
      if 'jpg' in formats:
        flags += ['-sUSE_LIBJPEG']
  
 -    if settings.PTHREADS:
 +    if settings.PTHREADS or opts['mt']:
        flags += ['-pthread']
  
-     ports.build_port(src_dir, final, 'sdl2_image', flags=flags, srcs=srcs)
-@@ -106,6 +108,12 @@ def handle_options(options, error_handler):
-       error_handler(f'{format} is not a supported format')
+     if settings.SUPPORT_LONGJMP == 'wasm':
+@@ -111,6 +113,12 @@ def handle_options(options, error_handler):
      else:
        opts['formats'].add(format)
-+      
+ 
 +  mt = options['mt']
-+  if mt not in ["1","0"]:
++  if mt not in ["1", "0"]:
 +    error_handler(f'{mt} has to be either 0 or 1')
 +  else:
 +    opts['mt'] = int(mt)
- 
++
  
  def show():
+   return 'sdl2_image (-sUSE_SDL_IMAGE=2 or --use-port=sdl2_image; zlib license)'
diff --git a/subprojects/argparse.wrap b/subprojects/argparse.wrap
@@ -1,13 +1,13 @@
 [wrap-file]
-directory = argparse-3.1
-source_url = https://github.com/p-ranav/argparse/archive/refs/tags/v3.1.tar.gz
-source_filename = argparse-3.1.tar.gz
-source_hash = d01733552ca4a18ab501ae8b8be878131baa32e89090fafdeef018ebfa4c6e46
-patch_filename = argparse_3.1-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/argparse_3.1-2/get_patch
-patch_hash = 681512473913fd9f918c1d1abc40a358a739e4d02df50d8b54bf3d863fa27266
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/argparse_3.1-2/argparse-3.1.tar.gz
-wrapdb_version = 3.1-2
+directory = argparse-3.2
+source_url = https://github.com/p-ranav/argparse/archive/refs/tags/v3.2.tar.gz
+source_filename = argparse-3.2.tar.gz
+source_hash = 9dcb3d8ce0a41b2a48ac8baa54b51a9f1b6a2c52dd374e28cc713bab0568ec98
+patch_filename = argparse_3.2-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/argparse_3.2-1/get_patch
+patch_hash = ddf1abdb00927ce60371fce3b751d66f07ddc879d1e55816218b017d7d972cf2
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/argparse_3.2-1/argparse-3.2.tar.gz
+wrapdb_version = 3.2-1
 
 [provide]
 argparse = argparse_dep
diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap
@@ -1,11 +1,11 @@
 [wrap-file]
-directory = cpp-httplib-0.18.3
-source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.18.3.tar.gz
-source_filename = cpp-httplib-0.18.3.tar.gz
-source_hash = a0567bcd6c3fe5cef1b329b96245119047f876b49e06cc129a36a7a8dffe173e
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.18.3-1/cpp-httplib-0.18.3.tar.gz
-wrapdb_version = 0.18.3-1
-diff_files = cpp-httplib-0.18.3_mingw.diff
+directory = cpp-httplib-0.19.0
+source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.19.0.tar.gz
+source_filename = cpp-httplib-0.19.0.tar.gz
+source_hash = c9b9e0524666e1cd088f0874c57c1ce7c0eaa8552f9f4e15c755d5201fc8c608
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.19.0-1/cpp-httplib-0.19.0.tar.gz
+wrapdb_version = 0.19.0-1
+diff_files = cpp-httplib-0.19.0_mingw.diff
 
 [provide]
 cpp-httplib = cpp_httplib_dep
diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap
@@ -1,13 +1,13 @@
 [wrap-file]
-directory = fmt-11.0.2
-source_url = https://github.com/fmtlib/fmt/archive/11.0.2.tar.gz
-source_filename = fmt-11.0.2.tar.gz
-source_hash = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f
-patch_filename = fmt_11.0.2-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch
-patch_hash = 90c9e3b8e8f29713d40ca949f6f93ad115d78d7fb921064112bc6179e6427c5e
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz
-wrapdb_version = 11.0.2-1
+directory = fmt-11.1.1
+source_url = https://github.com/fmtlib/fmt/archive/11.1.1.tar.gz
+source_filename = fmt-11.1.1.tar.gz
+source_hash = 482eed9efbc98388dbaee5cb5f368be5eca4893456bb358c18b7ff71f835ae43
+patch_filename = fmt_11.1.1-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.1.1-2/get_patch
+patch_hash = eee2e90d5d43061a0a1f0b9f8eb188c5b8820ef3e1b15e4b8a4eb791ef82b325
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.1.1-2/fmt-11.1.1.tar.gz
+wrapdb_version = 11.1.1-2
 diff_files = fmt_dependency_override.diff, fmt_emscripten.diff
 
 [provide]
diff --git a/subprojects/icu.wrap b/subprojects/icu.wrap
@@ -3,11 +3,11 @@ directory = icu
 source_url = https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-src.tgz
 source_filename = icu4c-76_1-src.tgz
 source_hash = dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e
-patch_filename = icu_76.1-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/icu_76.1-1/get_patch
-patch_hash = e50941b3a3f2034032079bbeaccd2c59b54963f12d43aefb9673a607556d4abc
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/icu_76.1-1/icu4c-76_1-src.tgz
-wrapdb_version = 76.1-1
+patch_filename = icu_76.1-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/icu_76.1-2/get_patch
+patch_hash = aa53ee7a3f742be81b597a7066d21777fcf9ab8f8793fa91b0565848854c27d6
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/icu_76.1-2/icu4c-76_1-src.tgz
+wrapdb_version = 76.1-2
 
 [provide]
 icu-uc = icuuc_dep
diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap
@@ -1,13 +1,13 @@
 [wrap-file]
-directory = libpng-1.6.44
-source_url = https://github.com/glennrp/libpng/archive/v1.6.44.tar.gz
-source_filename = libpng-1.6.44.tar.gz
-source_hash = 0ef5b633d0c65f780c4fced27ff832998e71478c13b45dfb6e94f23a82f64f7c
-patch_filename = libpng_1.6.44-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.44-1/get_patch
-patch_hash = 394b07614c45fbd1beac8b660386216a490fe12f841a1a445799b676c9c892fb
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.44-1/libpng-1.6.44.tar.gz
-wrapdb_version = 1.6.44-1
+directory = libpng-1.6.46
+source_url = https://github.com/glennrp/libpng/archive/v1.6.46.tar.gz
+source_filename = libpng-1.6.46.tar.gz
+source_hash = 767b01936f9620d4ab4cdf6ec348f6526f861f825648b610b1d604167dc738d2
+patch_filename = libpng_1.6.46-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.46-1/get_patch
+patch_hash = cb3ad0b73aeb2e99842f0ac50f974506c63ce77a9668e31b8ca156a47da3a222
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.46-1/libpng-1.6.46.tar.gz
+wrapdb_version = 1.6.46-1
 
 [provide]
 libpng = libpng_dep
diff --git a/subprojects/packagefiles/cpp-httplib-0.19.0_mingw.diff b/subprojects/packagefiles/cpp-httplib-0.19.0_mingw.diff
diff --git a/subprojects/packagefiles/discord_game_sdk/cpp/meson.build b/subprojects/packagefiles/discord_game_sdk/cpp/meson.build
@@ -49,7 +49,7 @@ if host_machine.system() == 'darwin'
     elif host_machine.cpu_family() == 'x86_64'
         lib_dir = 'lib' / 'x86_64'
     else
-        error('unsuported architectue for macos: ' + host_machine.cpu_family())
+        error('unsupported architecture for macos: ' + host_machine.cpu_family())
     endif
 
 elif host_machine.system() == 'linux'
@@ -81,11 +81,11 @@ elif host_machine.system() == 'linux'
         endif
 
         if linux_distro == 'alpine'
-            error('unsuported libc for linux: musl')
+            error('unsupported libc for linux: musl')
         endif
 
     else
-        error('unsuported architectue for linux: ' + host_machine.cpu_family())
+        error('unsupported architecture for linux: ' + host_machine.cpu_family())
     endif
 elif host_machine.system() == 'windows'
     dynamic_lib = 'discord_game_sdk.dll'
@@ -94,10 +94,10 @@ elif host_machine.system() == 'windows'
     elif host_machine.cpu_family() == 'x86_64'
         lib_dir = 'lib' / 'x86_64'
     else
-        error('unsuported architectue for windows: ' + host_machine.cpu_family())
+        error('unsupported architecture for windows: ' + host_machine.cpu_family())
     endif
 else
-    error('unsuported system: ' + host_machine.system())
+    error('unsupported system: ' + host_machine.system())
 endif
 
 c = meson.get_compiler('c')
diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap
@@ -1,13 +1,13 @@
 [wrap-file]
-directory = spdlog-1.15.0
-source_url = https://github.com/gabime/spdlog/archive/refs/tags/v1.15.0.tar.gz
-source_filename = spdlog-1.15.0.tar.gz
-source_hash = 9962648c9b4f1a7bbc76fd8d9172555bad1871fdb14ff4f842ef87949682caa5
-patch_filename = spdlog_1.15.0-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.15.0-1/get_patch
-patch_hash = 72bd578ff0eb4f5a84e5bd63ddc7b2ece84aad5abb516b54c8750306ae78df28
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.15.0-1/spdlog-1.15.0.tar.gz
-wrapdb_version = 1.15.0-1
+directory = spdlog-1.15.1
+source_url = https://github.com/gabime/spdlog/archive/refs/tags/v1.15.1.tar.gz
+source_filename = spdlog-1.15.1.tar.gz
+source_hash = 25c843860f039a1600f232c6eb9e01e6627f7d030a2ae5e232bdd3c9205d26cc
+patch_filename = spdlog_1.15.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.15.1-1/get_patch
+patch_hash = 75a3787aeab73c3b7426197820d9cd92a4cdf0ea5c8bbb6701c0f55c66a0a6d0
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.15.1-1/spdlog-1.15.1.tar.gz
+wrapdb_version = 1.15.1-1
 
 [provide]
 spdlog = spdlog_dep
diff --git a/tools/dependencies/meson.build b/tools/dependencies/meson.build
@@ -443,7 +443,7 @@ if build_application
         else
             # TODO: create a proper installer for macOS : https://mesonbuild.com/Creating-OSX-packages.html
             error(
-                'unsuported system for building the installer: '
+                'unsupported system for building the installer: '
                 + host_machine.system(),
             )
 

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ if build_application`
`443`	`443`	`else`
`444`	`444`	`# TODO: create a proper installer for macOS : https://mesonbuild.com/Creating-OSX-packages.html`
`445`	`445`	`error(`
`446`		`- 'unsuported system for building the installer: '`
	`446`	`+ 'unsupported system for building the installer: '`
`447`	`447`	`+ host_machine.system(),`
`448`	`448`	`)`
`449`	`449`