Skip to content

Commit a0b1e19

Browse files
ankith26ankith26
committed
Bump/update SDL_image deps
1 parent 9e71d42 commit a0b1e19

File tree

13 files changed

+33
-20
lines changed

13 files changed

+33
-20
lines changed

‎buildconfig/macdependencies/clean_usr_local.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ln -s /usr/bin/git /usr/local/bin/git
1313
ln -s /usr/bin/git /opt/homebrew/bin/git
1414

1515
rm -rf /usr/local/lib/libtiff*
16-
rm -rf /usr/local/lib/libzstd*
16+
rm -rf /usr/local/lib/libzstd* /opt/homebrew/lib/libzstd*
1717
rm -rf /usr/local/lib/libwebp*
1818
rm -rf /usr/local/lib/libdeflate*
1919
rm -rf /usr/local/lib/libsndfile*
@@ -25,6 +25,7 @@ rm -rf /usr/local/lib/libbrotlidec*
2525
rm -rf /usr/local/lib/libopus*
2626
rm -rf /usr/local/lib/freetype*
2727
rm -rf /usr/local/opt/freetype*
28+
rm -rf /opt/homebrew/lib/libgif*
2829

2930
rm -rf /usr/local/Cellar/libtiff /opt/homebrew/Cellar/libtiff
3031
rm -rf /usr/local/Cellar/libsndfile /opt/homebrew/Cellar/libsndfile

‎buildconfig/manylinux-build/docker_base/Dockerfile-aarch64‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ RUN ["bash", "/libjpegturbo_build/build-jpeg-turbo.sh"]
9494
ADD libpng /libpng_build/
9595
RUN ["bash", "/libpng_build/build-png.sh"]
9696

97-
ADD libwebp /webp_build/
98-
RUN ["bash", "/webp_build/build-webp.sh"]
99-
10097
ADD libtiff /libtiff_build/
10198
RUN ["bash", "/libtiff_build/build-tiff.sh"]
10299

100+
ADD libwebp /webp_build/
101+
RUN ["bash", "/webp_build/build-webp.sh"]
102+
103103
ADD brotli /brotli_build/
104104
RUN ["bash", "/brotli_build/build-brotli.sh"]
105105

‎buildconfig/manylinux-build/docker_base/Dockerfile-i686‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ RUN ["linux32", "bash", "/libjpegturbo_build/build-jpeg-turbo.sh"]
9494
ADD libpng /libpng_build/
9595
RUN ["linux32", "bash", "/libpng_build/build-png.sh"]
9696

97-
ADD libwebp /webp_build/
98-
RUN ["linux32", "bash", "/webp_build/build-webp.sh"]
99-
10097
ADD libtiff /libtiff_build/
10198
RUN ["linux32", "bash", "/libtiff_build/build-tiff.sh"]
10299

100+
ADD libwebp /webp_build/
101+
RUN ["linux32", "bash", "/webp_build/build-webp.sh"]
102+
103103
ADD brotli /brotli_build/
104104
RUN ["linux32", "bash", "/brotli_build/build-brotli.sh"]
105105

‎buildconfig/manylinux-build/docker_base/Dockerfile-x86_64‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ RUN ["bash", "/libjpegturbo_build/build-jpeg-turbo.sh"]
9494
ADD libpng /libpng_build/
9595
RUN ["bash", "/libpng_build/build-png.sh"]
9696

97-
ADD libwebp /webp_build/
98-
RUN ["bash", "/webp_build/build-webp.sh"]
99-
10097
ADD libtiff /libtiff_build/
10198
RUN ["bash", "/libtiff_build/build-tiff.sh"]
10299

100+
ADD libwebp /webp_build/
101+
RUN ["bash", "/webp_build/build-webp.sh"]
102+
103103
ADD brotli /brotli_build/
104104
RUN ["bash", "/brotli_build/build-brotli.sh"]
105105

‎buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
JPEG_VERSION=3.1.1
6+
JPEG_VERSION=3.1.2
77
JPEG="libjpeg-turbo-${JPEG_VERSION}"
88

99
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d08c8eb77281c1eee2c93ef9f2eefaf79a4b9adff5172ebcb20c845ccad8896a28fc3d622002cc8b28964ff860dca0a491d6b1b921aaa7aedccd21b909aad4cb libjpeg-turbo-3.1.1.tar.gz
1+
79271ae4ddc12e3753cc7323dc15617f1d82b2d554ef27b555712f6ab5de603323dd33747620815e3b55663a20e07b292a55172aee9f401f9fd3557145967abe libjpeg-turbo-3.1.2.tar.gz

‎buildconfig/manylinux-build/docker_base/libpng/build-png.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ sha512sum -c png.sha512
1111
tar xzf ${PNG}.tar.gz
1212
cd $PNG
1313

14-
./configure --with-zlib-prefix=$PG_DEP_PREFIX $PG_BASE_CONFIGURE_FLAGS
14+
cmake . $PG_BASE_CMAKE_FLAGS -DPNG_TESTS=0 -DPNG_TOOLS=0 -DPNG_STATIC=0 -DPNG_FRAMEWORK=0
1515
make
1616
make install

‎buildconfig/manylinux-build/docker_base/libtiff/build-tiff.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
TIFF=tiff-4.7.0
6+
TIFF=tiff-4.7.1
77

88
curl -sL --retry 10 https://download.osgeo.org/libtiff/${TIFF}.tar.gz > ${TIFF}.tar.gz
99
sha512sum -c tiff.sha512

‎buildconfig/manylinux-build/docker_base/libtiff/tiff.sha512‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a77a050d1d8777c6d86077c3c26e8d35f98717fe14bb3c049e2b82fbfbb374e96f83a0c1ff67ffb21591a9a7abf0d3e18c3d7695c96939326cc19a9712dd2492 tiff-4.7.0.tar.gz
1+
89c5af880626888451caf8b78a2f57b2973719db837dce6530c1fb30318fc6fba7ef9f9d8e46c547821eae29322607cb5146bf3de39b3d7b70bcf5b68c4ee3b1 tiff-4.7.1.tar.gz

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,26 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
WEBP=libwebp-1.5.0
6+
WEBP=libwebp-1.6.0
77

88
curl -sL --retry 10 http://storage.googleapis.com/downloads.webmproject.org/releases/webp/${WEBP}.tar.gz > ${WEBP}.tar.gz
99
sha512sum -c webp.sha512
1010

1111
tar xzf ${WEBP}.tar.gz
1212
cd $WEBP
1313

14-
./configure --enable-libwebpdemux $PG_BASE_CONFIGURE_FLAGS
14+
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
15+
# libwebp 1.6.0 introduced SIMD support for speedups. While it works on mac,
16+
# it doesn't compile on manylinux because gcc is too old for a particular SIMD
17+
# function (_mm256_cvtsi256_si32) webp happens to use.
18+
# TODO: enable SIMD when the issue is resolved.
19+
export PG_WEBP_EXTRA_ARGS="-DWEBP_ENABLE_SIMD=NO"
20+
fi
21+
22+
# we don't need to build webp commandline tools.
23+
cmake . $PG_BASE_CMAKE_FLAGS $PG_WEBP_EXTRA_ARGS \
24+
-DWEBP_BUILD_DWEBP=NO -DWEBP_BUILD_CWEBP=NO -DWEBP_BUILD_VWEBP=NO \
25+
-DWEBP_BUILD_ANIM_UTILS=NO -DWEBP_BUILD_GIF2WEBP=NO -DWEBP_BUILD_IMG2WEBP=NO \
26+
-DWEBP_BUILD_WEBPINFO=NO -DWEBP_BUILD_WEBPMUX=NO -DWEBP_BUILD_EXTRAS=NO
1527
make
1628
make install

0 commit comments

Comments
 (0)