Merge branch 'mesonbuild:master' into master

ci_config.json

@@ -1094,15 +1094,11 @@
       "windows": false
     },
     "alpine_packages": [
-      "wayland-dev"
-    ],
-    "debian_packages": [
-      "libwayland-bin",
-      "libwayland-dev"
+      "expat-dev",
+      "libffi-dev"
     ],
     "build_options": [
       "wayland:documentation=false",
-      "wayland:libraries=false",
       "wayland:tests=false",
       "wayland:dtd_validation=false"
     ]

releases.json

@@ -507,6 +507,7 @@
       "cpr"
     ],
     "versions": [
+      "1.11.0-1",
       "1.10.5-1",
       "1.10.4-1",
       "1.9.6-2",
@@ -1418,6 +1419,7 @@
       "jansson"
     ],
     "versions": [
+      "2.14-3",
       "2.14-2",
       "2.14-1",
       "2.13-1",
@@ -2490,6 +2492,7 @@
       "nanobind"
     ],
     "versions": [
+      "2.2.0-2",
       "2.2.0-1",
       "2.1.0-1"
     ]
@@ -3009,6 +3012,7 @@
       "quill"
     ],
     "versions": [
+      "7.4.0-1",
       "7.3.0-1",
       "7.2.2-1",
       "7.1.0-1",
@@ -3123,6 +3127,7 @@
       "rubberband"
     ],
     "versions": [
+      "4.0.0-1",
       "3.3.0-1",
       "2.0.2-1"
     ]
@@ -3198,6 +3203,7 @@
       "sdl2_image"
     ],
     "versions": [
+      "2.6.3-3",
       "2.6.3-2",
       "2.6.3-1",
       "2.6.2-1",
@@ -3399,6 +3405,7 @@
       "sqlite3"
     ],
     "versions": [
+      "3.47.0-1",
       "3.46.1-3",
       "3.46.1-2",
       "3.46.1-1",
@@ -3775,6 +3782,7 @@
       "wayland-protocols"
     ],
     "versions": [
+      "1.38-1",
       "1.37-1",
       "1.35-1",
       "1.32-1",
@@ -3878,6 +3886,14 @@
       "1.2.8-2"
     ]
   },
+  "zlib-ng": {
+    "dependency_names": [
+      "zlib-ng"
+    ],
+    "versions": [
+      "2.2.2-1"
+    ]
+  },
   "zpp_bits": {
     "dependency_names": [
       "zpp_bits"

subprojects/cpr.wrap

@@ -1,8 +1,8 @@
 [wrap-file]
-directory = cpr-1.10.5
-source_url = https://github.com/libcpr/cpr/archive/1.10.5.tar.gz
-source_filename = cpr-1.10.5.tar.gz
-source_hash = c8590568996cea918d7cf7ec6845d954b9b95ab2c4980b365f582a665dea08d8
+directory = cpr-1.11.0
+source_url = https://github.com/libcpr/cpr/archive/1.11.0.tar.gz
+source_filename = cpr-1.11.0.tar.gz
+source_hash = fdafa3e3a87448b5ddbd9c7a16e7276a78f28bbe84a3fc6edcfef85eca977784
 patch_directory = cpr
 
 [provide]

subprojects/packagefiles/cpr/meson.build

@@ -1,12 +1,12 @@
 project(
   'cpr',
   'cpp',
-  version: '1.10.5',
+  version: '1.11.0',
   license: 'MIT',
   default_options: 'cpp_std=c++17',
 )
 
-curl_dep = dependency('libcurl')
+curl_dep = dependency('libcurl', version: '>=7.64.0')
 thread_dep = dependency('threads')
 
 includes = include_directories('.', 'include')

subprojects/packagefiles/jansson/meson.build

@@ -82,6 +82,9 @@ configure_file(
   output: 'jansson_config.h',
   format: 'cmake@',
   configuration: cdata,
+  install: true,
+  install_dir: get_option('includedir'),
+  install_tag: 'devel'
 )
 
 jansson_lib = library('jansson',
@@ -96,7 +99,20 @@ jansson_lib = library('jansson',
   'src/strconv.c',
   'src/utf.c',
   'src/value.c',
-  c_args : '-DHAVE_CONFIG_H'
+  'src/version.c',
+  c_args : '-DHAVE_CONFIG_H',
+  vs_module_defs : 'src/jansson.def',
+  install : true
+)
+
+install_headers('src/jansson.h')
+
+pkg = import('pkgconfig')
+
+pkg.generate(
+  jansson_lib,
+  name: 'jansson',
+  description: 'Library for encoding, decoding and manipulating JSON data'
 )
 
 jansson_dep = declare_dependency(

subprojects/packagefiles/nanobind/meson.build

@@ -52,6 +52,13 @@ if get_option('buildtype') == 'release'
   add_project_arguments('-DNB_COMPACT_ASSERTIONS', language: 'cpp')
 endif
 
+freethreaded = py.get_variable('Py_GIL_DISABLED', 0) != 0
+if freethreaded
+  freethreaded_def = '-DNB_FREE_THREADED'
+  add_project_arguments(freethreaded_def, language : 'cpp')
+  dep_compile_args += [freethreaded_def]
+endif
+
 nanobind_lib = static_library(
     'nanobind',
     sources: [

subprojects/packagefiles/sdl2_image/meson.build

@@ -153,6 +153,7 @@ sdl2_image_lib = library(
   objc_args: full_library_args,
   dependencies: deps,
   gnu_symbol_visibility: 'hidden',
+  install: true
 )
 
 depinc = include_directories('.')

subprojects/packagefiles/sqlite3/meson.build

@@ -2,7 +2,7 @@ project(
   'sqlite3',
   'c',
   license: 'pd',
-  version: '3.46.1',
+  version: '3.47.0',
   meson_version: '>=0.48.0',
 )
 

subprojects/packagefiles/zlib-ng/LICENSE.build

@@ -0,0 +1,19 @@
+(C) 1995-2024 Jean-loup Gailly and Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.

subprojects/packagefiles/zlib-ng/get-version.py

@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+
+import argparse
+import os
+from pathlib import Path
+import re
+
+parser = argparse.ArgumentParser()
+parser.add_argument('type', choices=['zlib', 'zlib-ng'])
+args = parser.parse_args()
+
+if args.type == 'zlib':
+    regex = re.compile('#define ZLIB_VERSION "([0-9.]+)\\.zlib-ng"$')
+else:
+    regex = re.compile('#define ZLIBNG_VERSION "([0-9.]+)"$')
+
+zlib_h_in = (
+    Path(os.environ['MESON_SOURCE_ROOT']) /
+    os.environ['MESON_SUBDIR'] /
+    'zlib.h.in'
+)
+for line in zlib_h_in.open():
+    match = regex.match(line)
+    if match:
+        print(match.group(1))
+        break
+else:
+    raise Exception('Specified version not found in ' + zlib_h_in.as_posix())