From 01b48f0c635a653044057aad3ca2be7ce82ec495 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 7 Feb 2026 18:47:14 -0800 Subject: [PATCH 1/2] Reject builder containers with Meson 1.10.0 We're about to drop the bug workaround, so require older API versions that don't have 1.10.0. This partially reverts commit 5d032f0c421988b1e428aacfbcc4b12feafcce1e. Signed-off-by: Benjamin Gilbert --- bintool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bintool b/bintool index b512e1c..b2a0757 100755 --- a/bintool +++ b/bintool @@ -50,8 +50,8 @@ from common.meson import ( ) from common.software import Project -WINDOWS_API_VERS = (7, 8) -LINUX_API_VERS = (6, 7) +WINDOWS_API_VERS = (7,) +LINUX_API_VERS = (6,) # we have a higher minimum than the underlying meson.build MESON_MIN_VER = (1, 5, 0) From 84c4c3e31d0e2584e651b5615a2c357f92a1b316 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 7 Feb 2026 16:56:15 -0800 Subject: [PATCH 2/2] Revert "Add SPDX override for libjpeg-turbo to fix build on Meson 1.10.0" Meson 1.10.1 fixes the bug. This reverts commit d91ccc3ddc5287d696e19ea84619b4aaddd44def. Signed-off-by: Benjamin Gilbert --- common/software.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/common/software.py b/common/software.py index 5e1441a..8ee8f13 100644 --- a/common/software.py +++ b/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 @@ -421,8 +417,6 @@ def _sqlite3_license(proj: Project) -> tuple[str, str]: 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'], ),