Skip to content

Commit 4cabace

Browse files
authored
Merge pull request #422 from bgilbert/api
builder: bump API for Meson >= 1.10.0
2 parents 2fe8087 + 5d032f0 commit 4cabace

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

bintool

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ from common.meson import (
5050
)
5151
from common.software import Project
5252

53-
WINDOWS_API_VERS = (7,)
54-
LINUX_API_VERS = (6,)
53+
WINDOWS_API_VERS = (7, 8)
54+
LINUX_API_VERS = (6, 7)
5555
# we have a higher minimum than the underlying meson.build
5656
MESON_MIN_VER = (1, 5, 0)
5757

builder/linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM quay.io/almalinuxorg/almalinux:8
33
# NOTE: try to keep the current container image compatible with the latest
44
# stable source release, so people can conveniently build from the source
55
# tarball
6-
RUN touch /etc/openslide-linux-builder-v{5,6}
6+
RUN touch /etc/openslide-linux-builder-v7
77
RUN dnf -y upgrade && \
88
dnf -y install 'dnf-command(config-manager)' epel-release && \
99
dnf config-manager --set-enabled powertools && \

builder/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM docker.io/gentoo/stage3:latest
22
# NOTE: try to keep the current container image compatible with the latest
33
# stable source release, so people can conveniently build from the source
44
# tarball
5-
RUN touch /etc/openslide-winbuild-builder-v{6,7}
5+
RUN touch /etc/openslide-winbuild-builder-v8
66
RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf
77
COPY package.accept_keywords /etc/portage/package.accept_keywords/openslide
88
COPY package.use /etc/portage/package.use/openslide

0 commit comments

Comments
 (0)