Support and require Meson 1.10.2+

bintool

@@ -50,10 +50,8 @@ from common.meson import (
 )
 from common.software import Project
 
-WINDOWS_API_VERS = (7, 8)
-LINUX_API_VERS = (6, 7)
-# we have a higher minimum than the underlying meson.build
-MESON_MIN_VER = (1, 5, 0)
+WINDOWS_API_VERS = (9,)
+LINUX_API_VERS = (8,)
 
 CACHEDIR_TAG_CONTENTS = '''Signature: 8a477f597d28d172789f06886806bc55
 # This file is a cache directory tag created by openslide-bin.
@@ -162,16 +160,6 @@ class BuildParams:
                 )
             elif sys.platform == 'darwin':
                 # no container image to check for
-                meson_ver = (
-                    subprocess.check_output(['meson', '--version'])
-                    .decode()
-                    .strip()
-                )
-                if tuple(int(c) for c in meson_ver.split('.')) < MESON_MIN_VER:
-                    raise Exception(
-                        f'Meson version {meson_ver} < '
-                        f'{".".join(str(c) for c in MESON_MIN_VER)}'
-                    )
                 plat = MacPlatform(self, ['arm64', 'x86_64'])
             else:
                 raise Exception(

common/software.py

@@ -249,14 +249,10 @@ def spdx(self) -> str:
             meson_spdx = None
         if self.spdx_override is not None:
             if meson_spdx == self.spdx_override:
-                # temporary special case to avoid requiring all builders to
-                # use, or not use, Meson 1.10.0
-                # https://github.com/mesonbuild/meson/issues/15361
-                if self.id != 'libjpeg-turbo':
-                    raise ValueError(
-                        f'SPDX override for {self.id} matches Meson config '
-                        'and is no longer needed'
-                    )
+                raise ValueError(
+                    f'SPDX override for {self.id} matches Meson config and '
+                    'is no longer needed'
+                )
             return self.spdx_override
         elif type(meson_spdx) is str:
             return meson_spdx
@@ -414,15 +410,12 @@ def _sqlite3_license(proj: Project) -> tuple[str, str]:
         id='libffi',
         display='libffi',
         license_files=['LICENSE'],
-        spdx_override='MIT',
         remove_dirs=['doc', 'testsuite'],
     ),
     Project(
         id='libjpeg-turbo',
         display='libjpeg-turbo',
         license_files=['LICENSE.md', 'README.ijg'],
-        # see spdx property implementation
-        spdx_override='BSD-3-Clause AND IJG',
         remove_dirs=['doc', 'java', 'testimages'],
         keep_files=['simd/CMakeLists.txt'],
     ),

meson.build

@@ -7,7 +7,8 @@ project(
     check : true,
   ).stdout().strip(),
   license : 'LGPL-2.1-only',
-  meson_version : '>=1.2',
+  # for license extraction from libffi and libjpeg-turbo
+  meson_version : '>=1.10.2',
   default_options : [
     'buildtype=plain',
     'default_library=static',