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) 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'], ),