Clean up macOS Meson tweaks; fill gaps in enet packages. Give up on n…

…aev-macos unless macports gets v1.3.x.
naev · Aug 20, 2022 · aa56275 · aa56275
1 parent c0e4135
commit aa56275
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@
 - `naev-steamruntime` (Used for linux steam builds in the steamruntime (soldier) environment)
 - `naev-windows` (Used to cross compile for Windows.)
 
+### v1.6.6
+Clean up macOS Meson tweaks; fill gaps in enet packages. Give up on naev-macos unless macports gets v1.3.x.
+
 ### v1.6.5
 Document why mingw64-dlfcn is... interesting.
 

diff --git a/naev-linux-lts/Dockerfile.amd64 b/naev-linux-lts/Dockerfile.amd64
@@ -37,6 +37,20 @@ RUN yum -y install epel-release && \
     echo "Verifying git install" && \
     command -v git && \
     git --version
+
+# Fix a missing pkgconfig file (that e.g. Fedora's version of the package would have installed).
+COPY <<EOF /usr/lib64/pkgconfig/libenet.pc
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib64
+includedir=/usr/include
+
+Name: libenet
+Description: Low-latency UDP networking library supporting optional reliability
+Version: 1.3.11
+Cflags: -I${includedir}
+Libs: -L${libdir} -lenet
+EOF
 
 # Force appimages to run in extract mode since FUSE is not available
 ENV APPIMAGE_EXTRACT_AND_RUN 1

diff --git a/naev-macos/Dockerfile.aarch64 b/naev-macos/Dockerfile.aarch64
@@ -49,7 +49,7 @@ RUN sed -i 's/\bopenssl rmd160\b/openssl rmd160 -provider legacy/g' $(command -v
 
 
 # Install required build dependencies
-RUN UNATTENDED=1 osxcross-macports install -arm64 freetype glpk libenet libsdl2 libsdl2_image libpng \
+RUN UNATTENDED=1 osxcross-macports install -arm64 freetype glpk libsdl2 libsdl2_image libpng \
     libvorbis luajit openal-soft OpenBLAS pcre2 physfs SuiteSparse_CHOLMOD SuiteSparse_CXSparse webp -v && \
     UNATTENDED=1 osxcross-macports clear-cache
 

diff --git a/naev-macos/Dockerfile.amd64 b/naev-macos/Dockerfile.amd64
@@ -48,7 +48,7 @@ RUN sed -i 's/\bopenssl rmd160\b/openssl rmd160 -provider legacy/g' $(command -v
     sed -i 's/\bopenssl dgst -ripemd160 -verify\b/openssl dgst -provider default -provider legacy -ripemd160 -verify/g' $(command -v osxcross-macports)
 
 # Install required build dependencies
-RUN UNATTENDED=1 osxcross-macports install freetype glpk libenet libsdl2 libsdl2_image libpng \
+RUN UNATTENDED=1 osxcross-macports install freetype glpk libsdl2 libsdl2_image libpng \
     libvorbis luajit openal-soft OpenBLAS pcre2 physfs SuiteSparse_CHOLMOD SuiteSparse_CXSparse webp -v && \
     UNATTENDED=1 osxcross-macports clear-cache