Bump SDL_image deps

Author: ankith26

buildconfig/macdependencies/build_mac_deps.sh

@@ -46,9 +46,6 @@ if [[ "$MAC_ARCH" == "arm64" ]]; then
     # we don't need mac 10.9 support while compiling for apple M1 macs
     export MACOSX_DEPLOYMENT_TARGET=11.0
 else
-    # install NASM to generate optimised x86_64 libjpegturbo builds
-    brew install nasm
-
     # SDL 2.26.5 new minimum macos is 10.11, so we build our x86 mac deps
     # for 10.11 as well.
     export MACOSX_DEPLOYMENT_TARGET=10.11

buildconfig/macdependencies/clean_usr_local.sh

@@ -13,7 +13,7 @@ ln -s /usr/bin/git /usr/local/bin/git
 ln -s /usr/bin/git /opt/homebrew/bin/git
 
 rm -rf /usr/local/lib/libtiff*
-rm -rf /usr/local/lib/libzstd*
+rm -rf /usr/local/lib/libzstd* /opt/homebrew/lib/libzstd*
 rm -rf /usr/local/lib/libwebp*
 rm -rf /usr/local/lib/libdeflate*
 rm -rf /usr/local/lib/libsndfile*
@@ -25,6 +25,7 @@ rm -rf /usr/local/lib/libbrotlidec*
 rm -rf /usr/local/lib/libopus*
 rm -rf /usr/local/lib/freetype*
 rm -rf /usr/local/opt/freetype*
+rm -rf /opt/homebrew/lib/libgif*
 
 rm -rf /usr/local/Cellar/libtiff /opt/homebrew/Cellar/libtiff
 rm -rf /usr/local/Cellar/libsndfile /opt/homebrew/Cellar/libsndfile

buildconfig/manylinux-build/docker_base/Dockerfile-aarch64

@@ -94,12 +94,12 @@ RUN ["bash", "/libjpegturbo_build/build-jpeg-turbo.sh"]
 ADD libpng /libpng_build/
 RUN ["bash", "/libpng_build/build-png.sh"]
 
-ADD libwebp /webp_build/
-RUN ["bash", "/webp_build/build-webp.sh"]
-
 ADD libtiff /libtiff_build/
 RUN ["bash", "/libtiff_build/build-tiff.sh"]
 
+ADD libwebp /webp_build/
+RUN ["bash", "/webp_build/build-webp.sh"]
+
 ADD brotli /brotli_build/
 RUN ["bash", "/brotli_build/build-brotli.sh"]
 

buildconfig/manylinux-build/docker_base/Dockerfile-i686

@@ -94,12 +94,12 @@ RUN ["linux32", "bash", "/libjpegturbo_build/build-jpeg-turbo.sh"]
 ADD libpng /libpng_build/
 RUN ["linux32", "bash", "/libpng_build/build-png.sh"]
 
-ADD libwebp /webp_build/
-RUN ["linux32", "bash", "/webp_build/build-webp.sh"]
-
 ADD libtiff /libtiff_build/
 RUN ["linux32", "bash", "/libtiff_build/build-tiff.sh"]
 
+ADD libwebp /webp_build/
+RUN ["linux32", "bash", "/webp_build/build-webp.sh"]
+
 ADD brotli /brotli_build/
 RUN ["linux32", "bash", "/brotli_build/build-brotli.sh"]
 

buildconfig/manylinux-build/docker_base/Dockerfile-x86_64

@@ -94,12 +94,12 @@ RUN ["bash", "/libjpegturbo_build/build-jpeg-turbo.sh"]
 ADD libpng /libpng_build/
 RUN ["bash", "/libpng_build/build-png.sh"]
 
-ADD libwebp /webp_build/
-RUN ["bash", "/webp_build/build-webp.sh"]
-
 ADD libtiff /libtiff_build/
 RUN ["bash", "/libtiff_build/build-tiff.sh"]
 
+ADD libwebp /webp_build/
+RUN ["bash", "/webp_build/build-webp.sh"]
+
 ADD brotli /brotli_build/
 RUN ["bash", "/brotli_build/build-brotli.sh"]
 

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.1.1
+JPEG_VERSION=3.1.2
 JPEG="libjpeg-turbo-${JPEG_VERSION}"
 
 curl -sL --retry 10 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${JPEG_VERSION}/${JPEG}.tar.gz > ${JPEG}.tar.gz

buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512

@@ -1 +1 @@
-d08c8eb77281c1eee2c93ef9f2eefaf79a4b9adff5172ebcb20c845ccad8896a28fc3d622002cc8b28964ff860dca0a491d6b1b921aaa7aedccd21b909aad4cb  libjpeg-turbo-3.1.1.tar.gz
+79271ae4ddc12e3753cc7323dc15617f1d82b2d554ef27b555712f6ab5de603323dd33747620815e3b55663a20e07b292a55172aee9f401f9fd3557145967abe  libjpeg-turbo-3.1.2.tar.gz

buildconfig/manylinux-build/docker_base/libwebp/build-webp.sh

@@ -3,14 +3,26 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-WEBP=libwebp-1.5.0
+WEBP=libwebp-1.6.0
 
 curl -sL --retry 10 http://storage.googleapis.com/downloads.webmproject.org/releases/webp/${WEBP}.tar.gz > ${WEBP}.tar.gz
 sha512sum -c webp.sha512
 
 tar xzf ${WEBP}.tar.gz
 cd $WEBP
 
-./configure --enable-libwebpdemux $PG_BASE_CONFIGURE_FLAGS
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    # libwebp 1.6.0 introduced SIMD support for speedups. While it works on mac,
+    # it doesn't compile on manylinux because gcc is too old for a particular SIMD
+    # function (_mm256_cvtsi256_si32) webp happens to use.
+    # TODO: enable SIMD when the issue is resolved.
+    export PG_WEBP_EXTRA_ARGS="-DWEBP_ENABLE_SIMD=NO"
+fi
+
+# we don't need to build webp commandline tools.
+cmake . $PG_BASE_CMAKE_FLAGS $PG_WEBP_EXTRA_ARGS \
+    -DWEBP_BUILD_DWEBP=NO -DWEBP_BUILD_CWEBP=NO -DWEBP_BUILD_VWEBP=NO \
+    -DWEBP_BUILD_ANIM_UTILS=NO -DWEBP_BUILD_GIF2WEBP=NO -DWEBP_BUILD_IMG2WEBP=NO \
+    -DWEBP_BUILD_WEBPINFO=NO -DWEBP_BUILD_WEBPMUX=NO -DWEBP_BUILD_EXTRAS=NO
 make
 make install

buildconfig/manylinux-build/docker_base/libwebp/webp.sha512

@@ -1 +1 @@
-7a39594cf5585428f82d555b05e78aa63758a56841a313c0b74dfb4996afe37dddf92498d6123ff2a949a7209fb9097927f10ee75b5a38b481f110c892e5302b  libwebp-1.5.0.tar.gz
+5c159d9760efcb92749092536daada22c0a73c20926c76097a5f0448ddbf874cf761324ca97925ca5f578b30477564b2b072b47667e504673797128b31cafcbf  libwebp-1.6.0.tar.gz

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.2.4
+ZLIB_NG_VER=2.2.5
 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