Skip to content
Snippets Groups Projects
Verified Commit fd0e175f authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Windows package: bump dependencies

Incidentally, drop workarounds for pkg-config files of HDF5 and MatIO, since
the problems have been fixed upstream.
parent f6adb1d9
Branches
No related tags found
No related merge requests found
...@@ -149,10 +149,6 @@ lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.ta ...@@ -149,10 +149,6 @@ lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.ta
rm -rf $@ rm -rf $@
mkdir $@ mkdir $@
for f in $^; do tar xf $$f --directory $@ $(MSYS2_EXCLUDES); done for f in $^; do tar xf $$f --directory $@ $(MSYS2_EXCLUDES); done
# Workaround for https://sourceforge.net/p/matio/bugs/42/
patch -d lib64-msys2/mingw64/lib/pkgconfig/ < matio.pc.patch
# Workaround for https://github.com/msys2/MINGW-packages/issues/18554
patch -d lib64-msys2/mingw64/lib/pkgconfig/ < hdf5.pc.patch
touch $@ touch $@
mingw64: tarballs/mingw-w64-x86_64-gcc-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gcc-libs-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gmp-$(MINGW64_GMP_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-binutils-$(MINGW64_BINUTILS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-headers-git-$(MINGW64_HEADERS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-crt-git-$(MINGW64_CRT_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-winpthreads-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libwinpthread-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zstd-$(MINGW64_ZSTD_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-isl-$(MINGW64_ISL_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpc-$(MINGW64_MPC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpfr-$(MINGW64_MPFR_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libiconv-$(MINGW64_LIBICONV_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-windows-default-manifest-$(MINGW64_WINDOWS_DEFAULT_MANIFEST_VERSION)-any.pkg.tar.zst mingw64: tarballs/mingw-w64-x86_64-gcc-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gcc-libs-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gmp-$(MINGW64_GMP_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-binutils-$(MINGW64_BINUTILS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-headers-git-$(MINGW64_HEADERS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-crt-git-$(MINGW64_CRT_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-winpthreads-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libwinpthread-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zstd-$(MINGW64_ZSTD_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-isl-$(MINGW64_ISL_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpc-$(MINGW64_MPC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpfr-$(MINGW64_MPFR_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libiconv-$(MINGW64_LIBICONV_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-windows-default-manifest-$(MINGW64_WINDOWS_DEFAULT_MANIFEST_VERSION)-any.pkg.tar.zst
......
--- hdf5.pc.orig 2023-07-27 14:48:13.395698365 +0200
+++ hdf5.pc 2023-09-19 15:36:49.497960385 +0200
@@ -10,5 +10,4 @@
Cflags: -I${includedir}
Libs: -L${libdir} -lhdf5
Requires:
-Libs.private: -lhdf5 -lshlwapi -lm -lws2_32 -lwsock32 -l/mingw64/lib/libcurl.dll.a -l/mingw64/lib/libssl.dll.a -l/mingw64/lib/libcrypto.dll.a -l/mingw64/lib/libz.dll.a
-Requires.private:
+Requires.private: libcurl zlib
--- matio.pc.orig 2023-07-27 14:48:13.395698365 +0200
+++ matio.pc 2023-09-19 14:12:05.423816518 +0200
@@ -6,5 +6,6 @@
Name: MATIO
Description: MATIO Library
Version: 1.5.23
-Libs: -L${libdir} -lmatio -lhdf5 -lz
+Libs: -L${libdir} -lmatio -lz
+Requires.private: hdf5
Cflags: -I${includedir}
...@@ -18,23 +18,21 @@ MATLAB64_VERSION = 20200930 ...@@ -18,23 +18,21 @@ MATLAB64_VERSION = 20200930
## Build dependencies ## Build dependencies
# pacman -Ss mingw-w64-x86_64-boost # pacman -Ss mingw-w64-x86_64-boost
MINGW64_BOOST_VERSION = 1.81.0-7 MINGW64_BOOST_VERSION = 1.83.0-1
# pacman -Ss mingw-w64-x86_64-gsl # pacman -Ss mingw-w64-x86_64-gsl
MINGW64_GSL_VERSION = 2.7.1-1 MINGW64_GSL_VERSION = 2.7.1-2
# pacman -Ss mingw-w64-x86_64-matio # pacman -Ss mingw-w64-x86_64-matio
# NB: matio.pc.patch may need to be updated when upgrading MINGW64_MATIO_VERSION = 1.5.24-1
MINGW64_MATIO_VERSION = 1.5.23-4
# Dependency of matio (and of the MinGW compiler) # Dependency of matio (and of the MinGW compiler)
# pacman -Ss mingw-w64-x86_64-zlib # pacman -Ss mingw-w64-x86_64-zlib
MINGW64_ZLIB_VERSION = 1.2.13-3 MINGW64_ZLIB_VERSION = 1.3-1
# Dependency of matio # Dependency of matio
# pacman -Ss mingw-w64-x86_64-hdf5 # pacman -Ss mingw-w64-x86_64-hdf5
# NB: hdf5.pc.patch may need to be updated when upgrading MINGW64_HDF5_VERSION = 1.14.2-3
MINGW64_HDF5_VERSION = 1.14.1.2-2
# Dependency of HDF5 (provides szip library) # Dependency of HDF5 (provides szip library)
# pacman -Ss mingw-w64-x86_64-libaec # pacman -Ss mingw-w64-x86_64-libaec
...@@ -42,11 +40,11 @@ MINGW64_LIBAEC_VERSION = 1.0.6-2 ...@@ -42,11 +40,11 @@ MINGW64_LIBAEC_VERSION = 1.0.6-2
# Dependency of HDF5 # Dependency of HDF5
# pacman -Ss mingw-w64-x86_64-openssl # pacman -Ss mingw-w64-x86_64-openssl
MINGW64_OPENSSL_VERSION = 3.1.1-1 MINGW64_OPENSSL_VERSION = 3.1.4-1
# Dependency of HDF5 # Dependency of HDF5
# pacman -Ss mingw-w64-x86_64-curl # pacman -Ss mingw-w64-x86_64-curl
MINGW64_CURL_VERSION = 8.1.2-1 MINGW64_CURL_VERSION = 8.4.0-1
# Dependency of curl (and of the MinGW compiler) # Dependency of curl (and of the MinGW compiler)
# pacman -Ss mingw-w64-x86_64-zstd # pacman -Ss mingw-w64-x86_64-zstd
...@@ -54,7 +52,7 @@ MINGW64_ZSTD_VERSION = 1.5.5-1 ...@@ -54,7 +52,7 @@ MINGW64_ZSTD_VERSION = 1.5.5-1
# Dependency of curl # Dependency of curl
# pacman -Ss mingw-w64-x86_64-brotli # pacman -Ss mingw-w64-x86_64-brotli
MINGW64_BROTLI_VERSION = 1.0.9-5 MINGW64_BROTLI_VERSION = 1.1.0-1
# Dependency of curl # Dependency of curl
# pacman -Ss mingw-w64-x86_64-libpsl # pacman -Ss mingw-w64-x86_64-libpsl
...@@ -66,11 +64,11 @@ MINGW64_LIBIDN2_VERSION = 2.3.4-1 ...@@ -66,11 +64,11 @@ MINGW64_LIBIDN2_VERSION = 2.3.4-1
# Dependency of curl # Dependency of curl
# pacman -Ss mingw-w64-x86_64-libssh2 # pacman -Ss mingw-w64-x86_64-libssh2
MINGW64_LIBSSH2_VERSION = 1.10.0-2 MINGW64_LIBSSH2_VERSION = 1.11.0-2
# Dependency of curl # Dependency of curl
# pacman -Ss mingw-w64-x86_64-nghttp2 # pacman -Ss mingw-w64-x86_64-nghttp2
MINGW64_NGHTTP2_VERSION = 1.53.0-1 MINGW64_NGHTTP2_VERSION = 1.58.0-1
# Dependency of libpsl and libunistring (and of the MinGW compiler) # Dependency of libpsl and libunistring (and of the MinGW compiler)
# pacman -Ss mingw-w64-x86_64-libiconv # pacman -Ss mingw-w64-x86_64-libiconv
...@@ -83,31 +81,31 @@ MINGW64_LIBUNISTRING_VERSION = 1.1-1 ...@@ -83,31 +81,31 @@ MINGW64_LIBUNISTRING_VERSION = 1.1-1
## MinGW packages for the embedded compiler ## MinGW packages for the embedded compiler
# pacman -Ss mingw-w64-x86_64-gcc$ # pacman -Ss mingw-w64-x86_64-gcc$
MINGW64_GCC_VERSION = 13.1.0-6 MINGW64_GCC_VERSION = 13.2.0-2
# pacman -Ss mingw-w64-x86_64-gmp # pacman -Ss mingw-w64-x86_64-gmp
MINGW64_GMP_VERSION = 6.2.1-5 MINGW64_GMP_VERSION = 6.3.0-2
# pacman -Ss mingw-w64-x86_64-binutils # pacman -Ss mingw-w64-x86_64-binutils
MINGW64_BINUTILS_VERSION = 2.40-4 MINGW64_BINUTILS_VERSION = 2.41-2
# pacman -Ss mingw-w64-x86_64-headers-git # pacman -Ss mingw-w64-x86_64-headers-git
MINGW64_HEADERS_VERSION = 11.0.0.r18.g9df2e604d-1 MINGW64_HEADERS_VERSION = 11.0.0.r404.g3a137bd87-1
# pacman -Ss mingw-w64-x86_64-crt-git # pacman -Ss mingw-w64-x86_64-crt-git
MINGW64_CRT_VERSION = 11.0.0.r18.g9df2e604d-1 MINGW64_CRT_VERSION = 11.0.0.r404.g3a137bd87-1
# pacman -Ss mingw-w64-x86_64-winpthreads-git # pacman -Ss mingw-w64-x86_64-winpthreads-git
MINGW64_WINPTHREADS_VERSION = 11.0.0.r18.g9df2e604d-1 MINGW64_WINPTHREADS_VERSION = 11.0.0.r404.g3a137bd87-1
# pacman -Ss mingw-w64-x86_64-isl # pacman -Ss mingw-w64-x86_64-isl
MINGW64_ISL_VERSION = 0.26-1 MINGW64_ISL_VERSION = 0.26-1
# pacman -Ss mingw-w64-x86_64-mpc # pacman -Ss mingw-w64-x86_64-mpc
MINGW64_MPC_VERSION = 1.3.1-1 MINGW64_MPC_VERSION = 1.3.1-2
# pacman -Ss mingw-w64-x86_64-mpfr # pacman -Ss mingw-w64-x86_64-mpfr
MINGW64_MPFR_VERSION = 4.2.0.p9-1 MINGW64_MPFR_VERSION = 4.2.1-2
# pacman -Ss mingw-w64-x86_64-windows-default-manifest # pacman -Ss mingw-w64-x86_64-windows-default-manifest
MINGW64_WINDOWS_DEFAULT_MANIFEST_VERSION = 6.4-4 MINGW64_WINDOWS_DEFAULT_MANIFEST_VERSION = 6.4-4
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment