Skip to content

Drop workaround for license-parsing regression in Meson 1.10.0 #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bgilbert wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Drop workaround for license-parsing regression in Meson 1.10.0 #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01b48f0
Reject builder containers with Meson 1.10.0
bgilbert Feb 8, 2026
84c4c3e
Revert "Add SPDX override for libjpeg-turbo to fix build on Meson 1.1…
bgilbert Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bintool
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
14 changes: 4 additions & 10 deletions common/software.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'],
),
Expand Down
Loading