diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 b/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 index 62f1caf8f6..62f7b7c481 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 +++ b/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 @@ -40,6 +40,9 @@ ENV PG_BASE_MESON_FLAGS="--prefix=$PG_DEP_PREFIX \ # remember to keep this updated when we drop 3.11 support ENV PATH="/opt/python/cp311-cp311/bin:$PATH" +# libraries installed in dep prefix must be usable everywhere +ENV LD_LIBRARY_PATH="$PG_DEP_PREFIX/lib:$LD_LIBRARY_PATH" + ADD pkg-config /pkg-config_build/ RUN ["bash", "/pkg-config_build/build-pkg-config.sh"] diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 b/buildconfig/manylinux-build/docker_base/Dockerfile-i686 index 9ba1171df2..f1b2c3aff0 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 +++ b/buildconfig/manylinux-build/docker_base/Dockerfile-i686 @@ -40,6 +40,9 @@ ENV PG_BASE_MESON_FLAGS="--prefix=$PG_DEP_PREFIX \ # remember to keep this updated when we drop 3.11 support ENV PATH="/opt/python/cp311-cp311/bin:$PATH" +# libraries installed in dep prefix must be usable everywhere +ENV LD_LIBRARY_PATH="$PG_DEP_PREFIX/lib:$LD_LIBRARY_PATH" + ADD pkg-config /pkg-config_build/ RUN ["linux32", "bash", "/pkg-config_build/build-pkg-config.sh"] diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 b/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 index 11a2c4150f..b956f8a349 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 +++ b/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 @@ -40,6 +40,9 @@ ENV PG_BASE_MESON_FLAGS="--prefix=$PG_DEP_PREFIX \ # remember to keep this updated when we drop 3.11 support ENV PATH="/opt/python/cp311-cp311/bin:$PATH" +# libraries installed in dep prefix must be usable everywhere +ENV LD_LIBRARY_PATH="$PG_DEP_PREFIX/lib:$LD_LIBRARY_PATH" + ADD pkg-config /pkg-config_build/ RUN ["bash", "/pkg-config_build/build-pkg-config.sh"] diff --git a/buildconfig/manylinux-build/docker_base/alsa/alsa.sha512 b/buildconfig/manylinux-build/docker_base/alsa/alsa.sha512 index fadb0b78b3..0f056ee88c 100644 --- a/buildconfig/manylinux-build/docker_base/alsa/alsa.sha512 +++ b/buildconfig/manylinux-build/docker_base/alsa/alsa.sha512 @@ -1 +1 @@ -4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939 alsa-lib-1.2.10.tar.bz2 +053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d alsa-lib-1.2.12.tar.bz2 diff --git a/buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh b/buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh index 11ecb100af..5f43180040 100644 --- a/buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh +++ b/buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -ALSA=alsa-lib-1.2.10 +ALSA=alsa-lib-1.2.12 curl -sL https://www.alsa-project.org/files/pub/lib/${ALSA}.tar.bz2 > ${ALSA}.tar.bz2 sha512sum -c alsa.sha512 diff --git a/buildconfig/manylinux-build/docker_base/buildtools/install.sh b/buildconfig/manylinux-build/docker_base/buildtools/install.sh index 95f50c050a..9435b7d04b 100644 --- a/buildconfig/manylinux-build/docker_base/buildtools/install.sh +++ b/buildconfig/manylinux-build/docker_base/buildtools/install.sh @@ -17,7 +17,7 @@ fi # pin versions for stability (remember to keep updated) python3 -m pip install $PG_PIP_EXTRA_FLAGS \ - setuptools==68.2.2 cmake==3.27.6 meson==1.2.2 ninja==1.11.1 + setuptools==75.1.0 cmake==3.30.3 meson==1.5.2 ninja==1.11.1.1 if [[ "$OSTYPE" == "linux-gnu"* ]]; then cp /root/.local/bin/* /usr/bin diff --git a/buildconfig/manylinux-build/docker_base/flac/build-flac.sh b/buildconfig/manylinux-build/docker_base/flac/build-flac.sh index 6609d3c702..fc2de73ee1 100644 --- a/buildconfig/manylinux-build/docker_base/flac/build-flac.sh +++ b/buildconfig/manylinux-build/docker_base/flac/build-flac.sh @@ -13,6 +13,17 @@ unxz ${FLAC}.tar.xz tar xf ${FLAC}.tar cd $FLAC -./configure $PG_BASE_CONFIGURE_FLAGS +mkdir build +cd build + +# use cmake to try to catch the ogg dependency +cmake .. $PG_BASE_CMAKE_FLAGS \ + -DBUILD_CXXLIBS=0 \ + -DBUILD_PROGRAMS=0 \ + -DBUILD_EXAMPLES=0 \ + -DBUILD_TESTING=0 \ + -DBUILD_DOCS=0 \ + -DINSTALL_MANPAGES=0 + make make install diff --git a/buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh b/buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh index 03d1557b7e..f70dffdf5b 100644 --- a/buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh +++ b/buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -FSYNTH_VER="2.3.4" +FSYNTH_VER="2.3.6" FSYNTH="fluidsynth-$FSYNTH_VER" curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512 b/buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512 index c3651be414..68aa30b418 100644 --- a/buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512 +++ b/buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512 @@ -1 +1 @@ -79891116d78b9be1c38bce9e5759b9bb732c3d8ee31c6e57d1a3e2b5548879b91d19582e73ee7fb0fd243beba3bf1bbc341a26aab0b6440eef36fc55dce3e8b0 fluidsynth-2.3.4.tar.gz +521e103e49c281ab7a44a2a275f614894062c1be6eb4df776b11e3756803c6b4b73d1e9596d364959c81b37dff4798d56798f9262c486e098f072ae1e7bef1c1 fluidsynth-2.3.6.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/freetype/build-freetype.sh b/buildconfig/manylinux-build/docker_base/freetype/build-freetype.sh index abfdec33d0..14f6adb69c 100644 --- a/buildconfig/manylinux-build/docker_base/freetype/build-freetype.sh +++ b/buildconfig/manylinux-build/docker_base/freetype/build-freetype.sh @@ -3,8 +3,8 @@ set -e -x cd $(dirname `readlink -f "$0"`) -FREETYPE="freetype-2.13.2" -HARFBUZZ_VER=8.2.1 +FREETYPE="freetype-2.13.3" +HARFBUZZ_VER=10.0.1 HARFBUZZ_NAME="harfbuzz-$HARFBUZZ_VER" curl -sL --retry 10 https://savannah.nongnu.org/download/freetype/${FREETYPE}.tar.gz > ${FREETYPE}.tar.gz @@ -36,11 +36,12 @@ cd ${HARFBUZZ_NAME} # Cairo and chafa are only needed for harfbuzz commandline utilities so we # don't use it. glib available is a bit old so we don't prefer it as of now. # we also don't compile-in icu so that harfbuzz uses built-in unicode handling -./configure $PG_BASE_CONFIGURE_FLAGS --with-freetype=yes \ - --with-cairo=no --with-chafa=no --with-glib=no --with-icu=no \ - --disable-static -make -make install +meson setup _build $PG_BASE_MESON_FLAGS -Dfreetype=enabled \ + -Dglib=disabled -Dgobject=disabled -Dcairo=disabled -Dchafa=disabled -Dicu=disabled \ + -Dtests=disabled -Dintrospection=disabled -Ddocs=disabled + +meson compile -C _build +meson install -C _build if [[ "$OSTYPE" == "darwin"* ]]; then # We do a little hack... @@ -51,7 +52,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then # contains "freetype". This is fine for now when the harfbuzz we are # building has no other dependencies sed -i '' '/freetype/d' $PG_DEP_PREFIX/lib/pkgconfig/harfbuzz.pc - sed -i '' 's/ [^ ]*libfreetype.la//g' $PG_DEP_PREFIX/lib/libharfbuzz.la fi cd .. diff --git a/buildconfig/manylinux-build/docker_base/freetype/freetype.sha512 b/buildconfig/manylinux-build/docker_base/freetype/freetype.sha512 index 94d115c449..ac9d8a5a5b 100644 --- a/buildconfig/manylinux-build/docker_base/freetype/freetype.sha512 +++ b/buildconfig/manylinux-build/docker_base/freetype/freetype.sha512 @@ -1,2 +1,2 @@ -ada47d020511069e4e62745c7da767aab4a979a52d74a9802c09c102ea7a86dbb81351fc7e9ed41c23748be45f5937c91e61cc5107650ddd78cbd900d82bd28f freetype-2.13.2.tar.gz -8f4aeb5528cb4f74facda89eb9828ccf491d577450ccdd71c331c943edf56303fa73a077d6b620687ae1ba21564aa02e202dbae98b77ac0947bc45e044c05f67 harfbuzz-8.2.1.tar.xz +b7e7e67baed421dbe08c48dcde5d5891c0f7e3c1253be8dc27826c60eaa17ca89f888c3d5a6faf5141b02c154e1cf42d4ed6133b9959ddc359fe6bd41615ae89 freetype-2.13.3.tar.gz +3fb7dda6e51496337698d46cebe623f678a4e5b0f006be6e1309143a82408a362c149812477e083e14811a5cba565d76eb2c0804f5e1bbea7e1bf83678176048 harfbuzz-10.0.1.tar.xz diff --git a/buildconfig/manylinux-build/docker_base/libffi/build-libffi.sh b/buildconfig/manylinux-build/docker_base/libffi/build-libffi.sh index c4c887be75..05a48a2f7d 100644 --- a/buildconfig/manylinux-build/docker_base/libffi/build-libffi.sh +++ b/buildconfig/manylinux-build/docker_base/libffi/build-libffi.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -LIBFFI_VER="3.4.4" +LIBFFI_VER="3.4.6" LIBFFI="libffi-$LIBFFI_VER" curl -sL --retry 10 https://github.com/libffi/libffi/releases/download/v${LIBFFI_VER}/${LIBFFI}.tar.gz > ${LIBFFI}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libffi/libffi.sha512 b/buildconfig/manylinux-build/docker_base/libffi/libffi.sha512 index 20393528a3..7a3f08cfef 100644 --- a/buildconfig/manylinux-build/docker_base/libffi/libffi.sha512 +++ b/buildconfig/manylinux-build/docker_base/libffi/libffi.sha512 @@ -1 +1 @@ -88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 libffi-3.4.4.tar.gz +033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39 libffi-3.4.6.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.sh b/buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.sh index 09713e43d9..f48aa9a6ef 100644 --- a/buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.sh +++ b/buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -JPEG_VERSION=3.0.0 +JPEG_VERSION=3.0.4 JPEG="libjpeg-turbo-${JPEG_VERSION}" curl -sL --retry 10 https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/${JPEG_VERSION}.tar.gz > ${JPEG}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512 b/buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512 index dda8f33608..03bf8dbdc6 100644 --- a/buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512 +++ b/buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512 @@ -1 +1 @@ -0efb7ce16333f4f3556b889bdd83b0f91697ce1645cbfb13db0c8a93ef47dd9cb0805c7160edaf946d4d54faf30a33bae90800c189e8b4bd44fcf3ce98179115 libjpeg-turbo-3.0.0.tar.gz +f43e1b6b9d048e29e381796c71e1c34a04c0f1c52c1f462db9f9930cfc75d69a50861be2570a6a4adc26a4183b6601300fd9d5553c06bc042f0d32fc1e408ed9 libjpeg-turbo-3.0.4.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libpipewire/build-libpipewire.sh b/buildconfig/manylinux-build/docker_base/libpipewire/build-libpipewire.sh index ecb46c8828..2b0150bf05 100644 --- a/buildconfig/manylinux-build/docker_base/libpipewire/build-libpipewire.sh +++ b/buildconfig/manylinux-build/docker_base/libpipewire/build-libpipewire.sh @@ -3,8 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -# use pinned commit (latest at the time of this comment) as 1.0.3 has compilation issues -PIPEWIRE_VER="0cfe57f33d4a6e511577614e97c7491e6450f0eb" # 1.0.3 +PIPEWIRE_VER="1.2.4" PIPEWIRE="pipewire-$PIPEWIRE_VER" curl -sL --retry 10 https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${PIPEWIRE_VER}/${PIPEWIRE}.tar.gz > ${PIPEWIRE}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libpipewire/libpipewire.sha512 b/buildconfig/manylinux-build/docker_base/libpipewire/libpipewire.sha512 index 71083e311c..da8c65dd0b 100644 --- a/buildconfig/manylinux-build/docker_base/libpipewire/libpipewire.sha512 +++ b/buildconfig/manylinux-build/docker_base/libpipewire/libpipewire.sha512 @@ -1 +1 @@ -6ed0a6a140963a6c7b2bb53c8060ecbf5ede9514212d81f71bcbcc1edf685a7bb8f4bc57f43f8bef3590db392bd0bfb97b0670f2e365590c311f77d6ed8396b9 pipewire-0cfe57f33d4a6e511577614e97c7491e6450f0eb.tar.gz +8a5b14cb99846635d080adc9e257c59dd4ab8e84e0751d71d3371505de89d19b1769cb12020d8a45808676d625226cd07aa30544050097e5f9540c6e37e4f97e pipewire-1.2.4.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libpng/build-png.sh b/buildconfig/manylinux-build/docker_base/libpng/build-png.sh index 105b1a427f..4d9cb8b33a 100644 --- a/buildconfig/manylinux-build/docker_base/libpng/build-png.sh +++ b/buildconfig/manylinux-build/docker_base/libpng/build-png.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -PNG=libpng-1.6.40 +PNG=libpng-1.6.44 curl -sL --retry 10 http://download.sourceforge.net/libpng/${PNG}.tar.gz > ${PNG}.tar.gz sha512sum -c png.sha512 diff --git a/buildconfig/manylinux-build/docker_base/libpng/png.sha512 b/buildconfig/manylinux-build/docker_base/libpng/png.sha512 index 9a35962db3..5596c612b4 100644 --- a/buildconfig/manylinux-build/docker_base/libpng/png.sha512 +++ b/buildconfig/manylinux-build/docker_base/libpng/png.sha512 @@ -1 +1 @@ -e27c61cb8fecd2550ca742aad68560f83bcc5123875f6727c2992258212bd342020e35a0ed95de6c2a2ca3f388f3afe1da7965e98650df3a0b9c5726c8334f95 libpng-1.6.40.tar.gz +84a58ebb15df69b306b1822a9741cbff0d0e15d60a0978d831a8f9dee03b21df7cbc695102d6c135134f3daa8a0a7f050a890cd545bea102c078ba4520666e78 libpng-1.6.44.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libtiff/build-tiff.sh b/buildconfig/manylinux-build/docker_base/libtiff/build-tiff.sh index 42f945f5d4..4c22cb5bd0 100644 --- a/buildconfig/manylinux-build/docker_base/libtiff/build-tiff.sh +++ b/buildconfig/manylinux-build/docker_base/libtiff/build-tiff.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -TIFF=tiff-4.6.0 +TIFF=tiff-4.7.0 curl -sL --retry 10 https://download.osgeo.org/libtiff/${TIFF}.tar.gz > ${TIFF}.tar.gz sha512sum -c tiff.sha512 diff --git a/buildconfig/manylinux-build/docker_base/libtiff/tiff.sha512 b/buildconfig/manylinux-build/docker_base/libtiff/tiff.sha512 index eee957b0d6..2484018743 100644 --- a/buildconfig/manylinux-build/docker_base/libtiff/tiff.sha512 +++ b/buildconfig/manylinux-build/docker_base/libtiff/tiff.sha512 @@ -1 +1 @@ -80a117780fe5e2519b5c6661efa90a8a1e4591eb6300068b611ff9887285641c0782d9835482f589d6d109c3be6ffab8831c3561bb40e2456258deb1e896f08e tiff-4.6.0.tar.gz +a77a050d1d8777c6d86077c3c26e8d35f98717fe14bb3c049e2b82fbfbb374e96f83a0c1ff67ffb21591a9a7abf0d3e18c3d7695c96939326cc19a9712dd2492 tiff-4.7.0.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libwebp/build-webp.sh b/buildconfig/manylinux-build/docker_base/libwebp/build-webp.sh index b31410b817..48216aee15 100644 --- a/buildconfig/manylinux-build/docker_base/libwebp/build-webp.sh +++ b/buildconfig/manylinux-build/docker_base/libwebp/build-webp.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -WEBP=libwebp-1.3.2 +WEBP=libwebp-1.4.0 curl -sL --retry 10 http://storage.googleapis.com/downloads.webmproject.org/releases/webp/${WEBP}.tar.gz > ${WEBP}.tar.gz sha512sum -c webp.sha512 diff --git a/buildconfig/manylinux-build/docker_base/libwebp/webp.sha512 b/buildconfig/manylinux-build/docker_base/libwebp/webp.sha512 index 9a6bcfeb31..420fd8a6ea 100644 --- a/buildconfig/manylinux-build/docker_base/libwebp/webp.sha512 +++ b/buildconfig/manylinux-build/docker_base/libwebp/webp.sha512 @@ -1 +1 @@ -2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20 libwebp-1.3.2.tar.gz +1217363fbb5c860b17c2ba4612f240f121c74ced6e3e58e8aa61252a9022f59893c5874bfa433cc50a7e65bac1ae2bfa99fa2cede070183b7a467f148cebb0bd libwebp-1.4.0.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/libxml2/build-libxml2.sh b/buildconfig/manylinux-build/docker_base/libxml2/build-libxml2.sh index c3a6c23372..d0cfa01b56 100644 --- a/buildconfig/manylinux-build/docker_base/libxml2/build-libxml2.sh +++ b/buildconfig/manylinux-build/docker_base/libxml2/build-libxml2.sh @@ -3,8 +3,8 @@ set -e -x cd $(dirname `readlink -f "$0"`) -LIBXML2_VER=2.11 -LIBXML2_PATCH=7 +LIBXML2_VER=2.13 +LIBXML2_PATCH=4 LIBXML2="libxml2-$LIBXML2_VER.$LIBXML2_PATCH" curl -sL --retry 10 https://download.gnome.org/sources/libxml2/${LIBXML2_VER}/${LIBXML2}.tar.xz > ${LIBXML2}.tar.xz diff --git a/buildconfig/manylinux-build/docker_base/libxml2/libxml2.sha512 b/buildconfig/manylinux-build/docker_base/libxml2/libxml2.sha512 index 184db0686b..3634afb7d7 100644 --- a/buildconfig/manylinux-build/docker_base/libxml2/libxml2.sha512 +++ b/buildconfig/manylinux-build/docker_base/libxml2/libxml2.sha512 @@ -1 +1 @@ -202b0523d982eb5269dcb4644d8ab2ea31404771069462cdd6c5cd7e6672e0e50371ceb334133bb8f2c0a42f133e8f40c3f582bba5fc71ab168a2b18d4cfd81d libxml2-2.11.7.tar.xz +27bfaa63431798d3aa725b36af2005bda70a20b270e601cc3c8a07cc9fd02a080cb3d2b023eb42606a57b9786469488a7c09b71bdff1a518a0b4271c78c3f940 libxml2-2.13.4.tar.xz diff --git a/buildconfig/manylinux-build/docker_base/libxmp/build-libxmp.sh b/buildconfig/manylinux-build/docker_base/libxmp/build-libxmp.sh index c692aa4a06..e42ccd69a7 100644 --- a/buildconfig/manylinux-build/docker_base/libxmp/build-libxmp.sh +++ b/buildconfig/manylinux-build/docker_base/libxmp/build-libxmp.sh @@ -13,7 +13,7 @@ sha512sum -c libxmp.sha512 tar xzf ${XMP}.tar.gz cd ${XMP} -cmake . $PG_BASE_CMAKE_FLAGS +cmake . $PG_BASE_CMAKE_FLAGS -DLIBXMP_PIC=1 make make install diff --git a/buildconfig/manylinux-build/docker_base/mesa/glslang/build-glslang.sh b/buildconfig/manylinux-build/docker_base/mesa/glslang/build-glslang.sh index 7e1eafc81a..bc4845064c 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/glslang/build-glslang.sh +++ b/buildconfig/manylinux-build/docker_base/mesa/glslang/build-glslang.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -GLSLANG_VER=14.0.0 +GLSLANG_VER=14.3.0 GLSLANG="glslang-$GLSLANG_VER" curl -sL --retry 10 https://github.com/KhronosGroup/glslang/archive/refs/tags/${GLSLANG_VER}.tar.gz > ${GLSLANG}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/mesa/glslang/glslang.sha512sum b/buildconfig/manylinux-build/docker_base/mesa/glslang/glslang.sha512sum index 7a89c41f40..d7ada85e7d 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/glslang/glslang.sha512sum +++ b/buildconfig/manylinux-build/docker_base/mesa/glslang/glslang.sha512sum @@ -1 +1 @@ -45ec1a23a390319b9270761cf8befb832ac8b4bc215b211c41a543553a97e5ccf17c134c34d8fdbed6efe887a9a7c2f0a955d1bfe1add9e04cc3e95b12e1973a glslang-14.0.0.tar.gz +ce6d09cc4d98b01d162ec5a196eec017c4a5f25eaf98c6612695d911f8d136c2f7193ff8f2c07931b2e94182d2c654833adc3b645f0c225e1d07c4e6e7abfd76 glslang-14.3.0.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh b/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh index ab8655f61b..4d2fe8a054 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh +++ b/buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh @@ -6,7 +6,7 @@ cd $(dirname `readlink -f "$0"`) # The drm already available on manylinux docker images is too old for mesa, so # we need to compile the latest from source -DRM_VER="libdrm-2.4.120" +DRM_VER="libdrm-2.4.123" DRM="drm-$DRM_VER" curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/drm/-/archive/$DRM_VER/$DRM.tar.gz > $DRM.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum b/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum index f9ad9c96bc..71a0ac9ba5 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum +++ b/buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum @@ -1 +1 @@ -31428ec49476af3bb7acbe088ebb2411f2f69013af63afd0832546df1a45a7f45ebb472dce3f07946b9202e41deba7aae3590c2e721c56b6d64de908704ae308 drm-libdrm-2.4.120.tar.gz +b593eb26be0f4e3aac44dfe8ec4e37d9e1a2666f9c86f2dcd3c32bd3e6fe376bfce7bd1c47af4d39b85b3d6f43ebf12f02704f055106872fb35f1d85b45286f3 drm-libdrm-2.4.123.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh b/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh index d74dd78ec9..555519e75c 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh +++ b/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh @@ -4,4 +4,4 @@ set -e -x cd $(dirname `readlink -f "$0"`) # pin for build stability, remember to keep updated -python3 -m pip install mako==1.3.2 +python3 -m pip install mako==1.3.5 PyYAML==6.0.2 diff --git a/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh b/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh index db5c5c94bd..c98311fcbf 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh +++ b/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh @@ -7,7 +7,7 @@ cd $(dirname `readlink -f "$0"`) # wayland driver needs this) and glx (SDL needs it) # we don't support vulkan yet -MESA_VER="mesa-24.0.1" +MESA_VER="mesa-24.2.3" MESA="mesa-$MESA_VER" # yes mesa comes twice in the name curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/mesa/-/archive/$MESA_VER/$MESA.tar.gz > $MESA.tar.gz @@ -16,17 +16,7 @@ sha512sum -c mesa.sha512sum tar xzf $MESA.tar.gz cd $MESA -# For now, we don't compile in LLVM because of its weight. Because of this, we -# can't compile in support for the radeonsi driver -if [ `uname -m` == "aarch64" ]; then - # On aarch64 we allow mesa to use all drivers it wants to pick by default - # (because radeonsi is not used on arm platforms) - GALLIUM_DRIVERS="auto" -else - # all default except radeonsi - GALLIUM_DRIVERS="r300,r600,nouveau,virgl,svga,swrast,iris,crocus,i915" -fi - -# build with meson+ninja -meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=$GALLIUM_DRIVERS -Dvulkan-drivers=[] +# build with meson+ninja, a very minimal install will do because this is not actually +# being installed in the wheel +meson build/ $PG_BASE_MESON_FLAGS -Dgallium-drivers=softpipe -Dvulkan-drivers=[] ninja -C build/ install diff --git a/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum b/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum index bca5798299..41825beb9e 100644 --- a/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum +++ b/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum @@ -1 +1 @@ -66a6cea1712f3b20744c0865c10523313653be39fc5a75e8201dbf50188cad819bd52a6013d1bd7be3d622de948b750ceb41dc73649cdea2abbaa6bb016cc4a7 mesa-mesa-24.0.1.tar.gz +be99f38318509a864212c600a8b14e9615ef7d2cfbda8d020b0059585d05dcb850601200a139b2adaf04d8d7df9c4e2661014fafab15647f3d02e3db1196c998 mesa-mesa-24.2.3.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.sh b/buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.sh index 591ea4d238..68304b3fed 100644 --- a/buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.sh +++ b/buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -MPG123="mpg123-1.32.1" +MPG123="mpg123-1.32.7" curl -sL --retry 10 https://downloads.sourceforge.net/sourceforge/mpg123/${MPG123}.tar.bz2 > ${MPG123}.tar.bz2 sha512sum -c mpg123.sha512 diff --git a/buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512 b/buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512 index 12ee5b5600..e654844008 100644 --- a/buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512 +++ b/buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512 @@ -1 +1 @@ -084f4575d3ad88373a04035778b40e4871b6da969f42b426c76d9539632baa12534d7f0f9b976be228fd313dea9c31f7a259e0a8b56d044c7e89fefdf897def2 mpg123-1.32.1.tar.bz2 +71f7cf6035c489934400528d0eaf0c1104417867990dd0abcc99c682818ef1f3e99dbee9dcdd888d88ed172a8950d5df515b755a5c1c1b54fc56a28584ceef8c mpg123-1.32.7.tar.bz2 diff --git a/buildconfig/manylinux-build/docker_base/ogg/build-ogg.sh b/buildconfig/manylinux-build/docker_base/ogg/build-ogg.sh index ef670d6ea8..871056019c 100644 --- a/buildconfig/manylinux-build/docker_base/ogg/build-ogg.sh +++ b/buildconfig/manylinux-build/docker_base/ogg/build-ogg.sh @@ -13,13 +13,7 @@ sha512sum -c ogg.sha512 tar xzf ${OGG}.tar.gz cd $OGG -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - ./configure $PG_BASE_CONFIGURE_FLAGS -elif [[ "$OSTYPE" == "darwin"* ]]; then - # Use CMake on macOS because ./configure doesn't generate dylib - cmake . $PG_BASE_CMAKE_FLAGS -fi - +cmake . $PG_BASE_CMAKE_FLAGS make make install @@ -28,11 +22,6 @@ cd .. tar xzf ${VORBIS}.tar.gz cd $VORBIS -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - ./configure $PG_BASE_CONFIGURE_FLAGS -elif [[ "$OSTYPE" == "darwin"* ]]; then - # Use CMake on macOS because ./configure doesn't generate dylib - cmake . $PG_BASE_CMAKE_FLAGS -fi +cmake . $PG_BASE_CMAKE_FLAGS make make install diff --git a/buildconfig/manylinux-build/docker_base/opus/build-opus.sh b/buildconfig/manylinux-build/docker_base/opus/build-opus.sh index 2dc5fd85d3..b20cfe4d13 100644 --- a/buildconfig/manylinux-build/docker_base/opus/build-opus.sh +++ b/buildconfig/manylinux-build/docker_base/opus/build-opus.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -OPUS=opus-1.4 +OPUS=opus-1.5.2 OPUS_FILE=opusfile-0.12 curl -sL --retry 10 http://downloads.xiph.org/releases/opus/${OPUS}.tar.gz > ${OPUS}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/opus/opus.sha512 b/buildconfig/manylinux-build/docker_base/opus/opus.sha512 index edc9f955ad..fe35661b50 100644 --- a/buildconfig/manylinux-build/docker_base/opus/opus.sha512 +++ b/buildconfig/manylinux-build/docker_base/opus/opus.sha512 @@ -1,2 +1,2 @@ -1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631 opus-1.4.tar.gz +78d963cd56d5504611f111e2b3606e236189a3585d65fae1ecdbec9bf4545632b1956f11824328279a2d1ea2ecf441ebc11e455fb598d20a458df15185e95da4 opus-1.5.2.tar.gz e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af opusfile-0.12.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh index 26a6ec525f..146dd3abb6 100644 --- a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh +++ b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh @@ -20,7 +20,10 @@ curl -sL --retry 10 https://github.com/libsdl-org/SDL_mixer/releases/download/re curl -sL --retry 10 https://github.com/libsdl-org/SDL_ttf/releases/download/release-$TTF2_VER/$TTF2.tar.gz > ${TTF2}.tar.gz sha512sum -c sdl2.sha512 - +# On mac/manylinux we have to make use of standard dynamic linking rather than +# dlopen-ing the library itself. This is important for when auditwheel/delocate +# moves libraries into the wheel. +PG_DEPS_SHARED=0 # Build SDL tar xzf ${SDL2}.tar.gz @@ -30,87 +33,75 @@ tar xzf ${SDL2}.tar.gz if [[ "$MAC_ARCH" == "arm64" ]]; then # Build SDL with ARM optimisations on M1 macs - export M1_MAC_EXTRA_FLAGS="--enable-arm-simd --enable-arm-neon" + export ARM_EXTRA_FLAGS="-DSDL_ARMSIMD=1 -DSDL_ARMNEON=1" fi cd $SDL2 -./configure --disable-video-vulkan $PG_BASE_CONFIGURE_FLAGS $M1_MAC_EXTRA_FLAGS +mkdir builddir && cd builddir + +cmake -S .. -B . $PG_BASE_CMAKE_FLAGS -DSDL_VULKAN=0 $ARM_EXTRA_FLAGS make make install -cd .. +cd ../.. # Build SDL_image tar xzf ${IMG2}.tar.gz cd $IMG2 -# The --disable-x-shared flags make it use standard dynamic linking rather than -# dlopen-ing the library itself. This is important for when auditwheel moves -# libraries into the wheel. -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - # linux - export SDL_IMAGE_CONFIGURE= -elif [[ "$OSTYPE" == "darwin"* ]]; then +if [[ "$OSTYPE" == "darwin"* ]]; then # Mac OSX - # --disable-imageio is so it doesn't use the built in mac image loading. - # Since it is not as compatible with some jpg/png files. - export SDL_IMAGE_CONFIGURE=--disable-imageio + # disable imageio is so it doesn't use the built in mac image loading. + # Since it is not as compatible with some jpg/png files. + export SDL_IMAGE_CONFIGURE="-DSDL2IMAGE_BACKEND_IMAGEIO=0" +else + export SDL_IMAGE_CONFIGURE= fi +mkdir builddir && cd builddir + # We prefer libpng and libjpeg-turbo over stb-image at the moment # We also don't compile avif and jxl support at the moment -./configure $ARCHS_CONFIG_FLAG \ - --disable-stb-image \ - --disable-avif --disable-avif-shared \ - --disable-jxl --disable-jxl-shared \ - --enable-png --disable-png-shared \ - --enable-jpg --disable-jpg-shared \ - --enable-tif --disable-tif-shared \ - --enable-webp --disable-webp-shared \ - $SDL_IMAGE_CONFIGURE $PG_BASE_CONFIGURE_FLAGS +cmake -S .. -B . $PG_BASE_CMAKE_FLAGS $SDL_IMAGE_CONFIGURE \ + -DSDL2IMAGE_DEPS_SHARED=$PG_DEPS_SHARED -DSDL2IMAGE_VENDORED=0 \ + -DSDL2IMAGE_BACKEND_STB=0 -DSDL2IMAGE_AVIF=0 -DSDL2IMAGE_JXL=0 \ + -DSDL2IMAGE_TIF=1 -DSDL2IMAGE_WEBP=1 + make make install -cd .. +cd ../.. # Build SDL_ttf tar xzf ${TTF2}.tar.gz cd $TTF2 +mkdir builddir && cd builddir # We already build freetype+harfbuzz for pygame.freetype # So we make SDL_ttf use that instead of SDL_ttf vendored copies -./configure $PG_BASE_CONFIGURE_FLAGS --disable-freetype-builtin --disable-harfbuzz-builtin +cmake -S .. -B . $PG_BASE_CMAKE_FLAGS -DSDL2TTF_VENDORED=0 -DSDL2TTF_HARFBUZZ=1 make make install -cd .. +cd ../.. # Build SDL_mixer tar xzf ${MIX2}.tar.gz cd $MIX2 +mkdir builddir && cd builddir -# The --disable-x-shared flags make it use standard dynamic linking rather than -# dlopen-ing the library itself. This is important for when auditwheel moves -# libraries into the wheel. # We prefer libflac, mpg123 and ogg-vorbis over SDL vendored implementations # at the moment. This can be changed later if need arises. # We don't build with libgme for now -./configure $PG_BASE_CONFIGURE_FLAGS \ - --disable-dependency-tracking \ - --disable-music-ogg-stb --enable-music-ogg-vorbis \ - --disable-music-flac-drflac --enable-music-flac-libflac \ - --disable-music-mp3-drmp3 --disable-music-mp3-minimp3 --enable-music-mp3-mpg123 \ - --disable-music-mod-modplug \ - --enable-music-mod-xmp --disable-music-mod-xmp-shared \ - --enable-music-midi-fluidsynth --disable-music-midi-fluidsynth-shared \ - --enable-music-opus --disable-music-opus-shared \ - --enable-music-wavpack --disable-music-wavpack-shared \ - --disable-music-ogg-vorbis-shared \ - --disable-music-ogg-tremor \ - --disable-music-flac-libflac-shared \ - --disable-music-mp3-mpg123-shared \ - --disable-music-gme +# With CMake, libxmp is handled differently compared to the other dependencies. +# The library gets statically linked instead of using standard dynamic linking. +# A fix has been proposed: https://github.com/libsdl-org/SDL_mixer/pull/642 +cmake -S .. -B . $PG_BASE_CMAKE_FLAGS \ + -DSDL2MIXER_DEPS_SHARED=$PG_DEPS_SHARED -DSDL2MIXER_VENDORED=0 \ + -DSDL2MIXER_FLAC_LIBFLAC=1 -DSDL2MIXER_FLAC_DRFLAC=0 \ + -DSDL2MIXER_MP3_MPG123=1 -DSDL2MIXER_MP3_MINIMP3=0 \ + -DSDL2MIXER_VORBIS=VORBISFILE make make install diff --git a/buildconfig/manylinux-build/docker_base/wayland/build-wayland.sh b/buildconfig/manylinux-build/docker_base/wayland/build-wayland.sh index a1ea050b0e..633d558a34 100644 --- a/buildconfig/manylinux-build/docker_base/wayland/build-wayland.sh +++ b/buildconfig/manylinux-build/docker_base/wayland/build-wayland.sh @@ -3,8 +3,8 @@ set -e -x cd $(dirname `readlink -f "$0"`) -WAYLAND_VER=1.21.0 -WAYLAND_PROT_VER=1.31 +WAYLAND_VER=1.23.1 +WAYLAND_PROT_VER=1.37 WAYLAND="wayland-$WAYLAND_VER" WAYLAND_PROT="wayland-protocols-$WAYLAND_PROT_VER" diff --git a/buildconfig/manylinux-build/docker_base/wayland/wayland.sha512sum b/buildconfig/manylinux-build/docker_base/wayland/wayland.sha512sum index 7b2dcf77ba..529c8b914d 100644 --- a/buildconfig/manylinux-build/docker_base/wayland/wayland.sha512sum +++ b/buildconfig/manylinux-build/docker_base/wayland/wayland.sha512sum @@ -1,2 +1,2 @@ -856378c43c43c1a1ff2a047055ac6e8d7bb2b0bd44bd5a96c0ebd5c8b97a10482367b81d56ed49774ae1fffda0fa18cfb9110ffcb4da413ecf97d1fe6d7f35dd wayland-1.21.0.tar.gz -cb0d38fada64832f8f7c71c1fcdd16fc3013cd81ac7146edbc4361328c9e5f02e31e0ba3b5219e85103fdc35aee49d54f9be537594d3618c5fb27de7375f84e1 wayland-protocols-1.31.tar.gz +454a4d7cab9fb9eafe3505114e9dfafed94c985fb7f156eb2d67f258bf2bf8418598ab75c237aa75fabe81a811981dbc72363870f2f81ddcbfb3adfaa95d4947 wayland-1.23.1.tar.gz +7e7bf7fe77ddbecdb13b4c09248866e7f515c0bcb007635397c1e6ded388a1f708c267f0d13673b439ee8e75e568467acb49b7a882b22ab9e9f1c8c300bb2b22 wayland-protocols-1.37.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/build-libpciaccess.sh b/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/build-libpciaccess.sh index 63a76b0c60..759e98e367 100644 --- a/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/build-libpciaccess.sh +++ b/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/build-libpciaccess.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -PCIACCESS_VER="0.18" +PCIACCESS_VER="0.18.1" PCIACCESS="libpciaccess-$PCIACCESS_VER" curl -sL --retry 10 https://www.x.org/releases/individual/lib/$PCIACCESS.tar.xz > $PCIACCESS.tar.xz diff --git a/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/libpciaccess.sha512sum b/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/libpciaccess.sha512sum index 9eb75aeb57..dfaaff90fc 100644 --- a/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/libpciaccess.sha512sum +++ b/buildconfig/manylinux-build/docker_base/xorg/libpciaccess/libpciaccess.sha512sum @@ -1 +1 @@ -54dff9a493344586d072edf8c8eb8f7960c7dfd64aa5c51a8ec8d4e341f703fd39eb606ee41c4fdd9d5aad3372b7efe6e0fe96eadc575ea91de276320ebc3fbd libpciaccess-0.18.tar.xz +ef27999446e735df2331e94219ee3dafe9198a2472bb452f63ef9c9c446d5431f9e231e224cfabdeba1402974a5a0064546f9abced4d1770f994f5fc0c2b3310 libpciaccess-0.18.1.tar.xz diff --git a/buildconfig/manylinux-build/docker_base/xorg/macros/build-macros.sh b/buildconfig/manylinux-build/docker_base/xorg/macros/build-macros.sh index 05c6f76991..73a01c4f5f 100644 --- a/buildconfig/manylinux-build/docker_base/xorg/macros/build-macros.sh +++ b/buildconfig/manylinux-build/docker_base/xorg/macros/build-macros.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -MACROS_VER="1.20.0" +MACROS_VER="1.20.1" MACROS="util-macros-$MACROS_VER" curl -sL --retry 10 https://www.x.org/releases/individual/util/$MACROS.tar.gz > $MACROS.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/xorg/macros/macros.sha512sum b/buildconfig/manylinux-build/docker_base/xorg/macros/macros.sha512sum index 2eb0534ddc..e06a28b041 100644 --- a/buildconfig/manylinux-build/docker_base/xorg/macros/macros.sha512sum +++ b/buildconfig/manylinux-build/docker_base/xorg/macros/macros.sha512sum @@ -1 +1 @@ -0724cf57cbf00fe115596457bf2031cdad5845bebdcc1ee4ff90b4f77b4ebc862b0f7d250272ef58c2929aedead3d18d11f23f067e50fcac22863a1fcd4f3d66 util-macros-1.20.0.tar.gz +7a4329697a40b645d056b35edfc5b2b66c15994c85ee6d9a40c923d05a3c48889c30f7887754ae8f33a96bc70c87f52e58ee74e4caa50203d004b80dfc08e150 util-macros-1.20.1.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/zlib-ng/build-zlib-ng.sh b/buildconfig/manylinux-build/docker_base/zlib-ng/build-zlib-ng.sh index 29033209ab..1a7044c161 100644 --- a/buildconfig/manylinux-build/docker_base/zlib-ng/build-zlib-ng.sh +++ b/buildconfig/manylinux-build/docker_base/zlib-ng/build-zlib-ng.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -ZLIB_NG_VER=2.1.3 +ZLIB_NG_VER=2.2.2 ZLIB_NG_NAME="zlib-ng-$ZLIB_NG_VER" curl -sL --retry 10 https://github.com/zlib-ng/zlib-ng/archive/refs/tags/${ZLIB_NG_VER}.tar.gz > ${ZLIB_NG_NAME}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/zlib-ng/zlib-ng.sha512 b/buildconfig/manylinux-build/docker_base/zlib-ng/zlib-ng.sha512 index 1b89a9e636..224a1ec392 100644 --- a/buildconfig/manylinux-build/docker_base/zlib-ng/zlib-ng.sha512 +++ b/buildconfig/manylinux-build/docker_base/zlib-ng/zlib-ng.sha512 @@ -1 +1 @@ -cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e zlib-ng-2.1.3.tar.gz +3cb3e97ee1d20e1f3cdf0efcdf55aee0e3a192f9a2ae781cd209b1d37620c48f2ada345fb1f4357315b1cb5e09b7ea5fcdfa2fd54f7b4ac5dcb6e73860000aad zlib-ng-2.2.2.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/zlib/build-zlib.sh b/buildconfig/manylinux-build/docker_base/zlib/build-zlib.sh index 9f99471caf..62c2c69808 100644 --- a/buildconfig/manylinux-build/docker_base/zlib/build-zlib.sh +++ b/buildconfig/manylinux-build/docker_base/zlib/build-zlib.sh @@ -3,7 +3,7 @@ set -e -x cd $(dirname `readlink -f "$0"`) -ZLIB_VER=1.3 +ZLIB_VER=1.3.1 ZLIB_NAME="zlib-$ZLIB_VER" curl -sL --retry 10 https://www.zlib.net/${ZLIB_NAME}.tar.gz > ${ZLIB_NAME}.tar.gz diff --git a/buildconfig/manylinux-build/docker_base/zlib/zlib.sha512 b/buildconfig/manylinux-build/docker_base/zlib/zlib.sha512 index 3bd6220f91..f383544f9e 100644 --- a/buildconfig/manylinux-build/docker_base/zlib/zlib.sha512 +++ b/buildconfig/manylinux-build/docker_base/zlib/zlib.sha512 @@ -1 +1 @@ -185795044461cd78a5545250e06f6efdb0556e8d1bfe44e657b509dd6f00ba8892c8eb3febe65f79ee0b192d6af857f0e0055326d33a881449f3833f92e5f8fb zlib-1.3.tar.gz +580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f zlib-1.3.1.tar.gz