diff --git a/CHANGELOG.md b/CHANGELOG.md index 1230e1a..de9b3bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - `naev-steamruntime` (Used for testing linux steam builds in the steamruntime (sniper) environment with extra dependencies installed.) - `naev-windows` (Used to cross compile for Windows.) +### v1.10.3 +- It's naev-steamruntime that needs the Meson bump. + ### v1.10.2 - Require modern Meson for naev-linux as well; install C++ compiler for Windows. diff --git a/naev-linux-latest/Dockerfile b/naev-linux-latest/Dockerfile index 3f4fffd..384b2bd 100644 --- a/naev-linux-latest/Dockerfile +++ b/naev-linux-latest/Dockerfile @@ -40,8 +40,6 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build # Install utilities git libevent lua nano ncurses python3-pyyaml python3-mutagen readline tar texinfo xz unzip zip && \ microdnf clean all && \ -# Need Meson >=1.2.0 for fancy wrap files. - python3 -m pip install meson --upgrade # Verify tool versions and install locations. echo "Verifying python install" && \ command -v python3 && \ diff --git a/naev-steamruntime/Dockerfile b/naev-steamruntime/Dockerfile index d778647..b86aa06 100644 --- a/naev-steamruntime/Dockerfile +++ b/naev-steamruntime/Dockerfile @@ -44,6 +44,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ # Naughty: we need libluajit-5.1-dev, libglpk-dev and libsuitesparse-dev, not in the SDK.... All are statically linked when building with the steamruntime option in meson set to true. Also, texinfo is an accidental build dependency for libbfd. libluajit-5.1-dev libglpk-dev libsuitesparse-dev texinfo && \ apt-get clean && \ +# Need Meson >=1.2.0 for fancy wrap files. + python3 -m pip install meson --upgrade # Verify meson and python. echo "Verifying python install" && \ command -v python3 && \