naev-macos can go back to installing Meson via pip; the key bug-fix is released now.

Author: UncombedCoconut

CHANGELOG.md

@@ -1,12 +1,13 @@
 ### v1.3.1:
 Added MXE packaged luajit to naev-windows image.
+Returned to official Meson releases in the naev-macos image, now that a key bug-fix is released.
 
 ### v1.3.0 (Long gap, can't fully remember what we did in between):
 This 'release' bumps our MXE Windows Cross-compile environment base image to Ubuntu 20.04.
 
 ### v1.1.2:
-This 'release' moves images over to the Github Package Registry here: https://github.com/users/ProjectSynchro/packages?repo_name=synchros-sexy-docker-containers
-They are used in https://github.com/naev/naev CI and CD workflows to provide standard build environments.
+This 'release' moves images over to the Github Package Registry here: <https://github.com/users/ProjectSynchro/packages?repo_name=synchros-sexy-docker-containers>
+They are used in <https://github.com/naev/naev> CI and CD workflows to provide standard build environments.
 
 ### The story so far:
 naev-ubuntu1604 (used for appimage release builds, oldest targetted glibc platform)

naev/naev-macos/Dockerfile

@@ -26,13 +26,8 @@ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
     echo "Verifying pip install" && \
     python3 -m pip --version
 
-# Install a development version of Meson which fixes https://github.com/mesonbuild/meson/issues/8165
-WORKDIR /usr/local/src
-RUN git clone https://github.com/mesonbuild/meson.git
-
-WORKDIR /usr/local/src/meson
-RUN git checkout e6a167ce092a36017a4ff56b3fb045be62377a25 && \
-    python3 -m pip install . && \
+# Install meson via pip.
+RUN python3 -m pip install meson && \
     echo "Verifying meson install" && \
     which meson && \
     meson --version