Skip to content

Commit 62e29e6

Browse files
authored
Bump deps: archive, png, zlib-ng (#303)
1 parent 3791d5d commit 62e29e6

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

build/posix.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,11 @@ fi
127127
mkdir ${DEPS}/zlib-ng
128128
$CURL https://github.com/zlib-ng/zlib-ng/archive/${VERSION_ZLIB_NG}.tar.gz | tar xzC ${DEPS}/zlib-ng --strip-components=1
129129
cd ${DEPS}/zlib-ng
130+
# Downgrade minimum required CMake version to 3.13 - https://github.com/zlib-ng/zlib-ng/pull/2001
131+
sed -i'.bak' "/^cmake_minimum_required/s/3.14/3.13/" CMakeLists.txt
130132
CFLAGS="${CFLAGS} -O3" cmake -G"Unix Makefiles" \
131133
-DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \
132-
-DBUILD_SHARED_LIBS=FALSE -DZLIB_COMPAT=TRUE -DWITH_ARMV6=FALSE
134+
-DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=FALSE -DZLIB_COMPAT=TRUE -DWITH_ARMV6=FALSE
133135
make install/strip
134136

135137
mkdir ${DEPS}/ffi
@@ -191,8 +193,8 @@ make install/strip
191193
mkdir ${DEPS}/heif
192194
$CURL https://github.com/strukturag/libheif/releases/download/v${VERSION_HEIF}/libheif-${VERSION_HEIF}.tar.gz | tar xzC ${DEPS}/heif --strip-components=1
193195
cd ${DEPS}/heif
194-
# Downgrade minimum required CMake version to 3.12 - https://github.com/strukturag/libheif/issues/975
195-
sed -i'.bak' "/^cmake_minimum_required/s/3.16.3/3.12/" CMakeLists.txt
196+
# Downgrade minimum required CMake version to 3.13 - https://github.com/strukturag/libheif/issues/975
197+
sed -i'.bak' "/^cmake_minimum_required/s/3.16.3/3.13/" CMakeLists.txt
196198
CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" cmake -G"Unix Makefiles" \
197199
-DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \
198200
-DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=0 -DENABLE_PLUGIN_LOADING=0 -DWITH_EXAMPLES=0 -DWITH_LIBDE265=0 -DWITH_X265=0

versions.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION_AOM=3.13.1
2-
VERSION_ARCHIVE=3.8.3
2+
VERSION_ARCHIVE=3.8.4
33
VERSION_CAIRO=1.18.4
44
VERSION_CGIF=0.5.0
55
VERSION_EXIF=0.6.25
@@ -17,11 +17,11 @@ VERSION_LCMS=2.17
1717
VERSION_MOZJPEG=0826579
1818
VERSION_PANGO=1.57.0
1919
VERSION_PIXMAN=0.46.4
20-
VERSION_PNG=1.6.51
20+
VERSION_PNG=1.6.52
2121
VERSION_PROXY_LIBINTL=0.5
2222
VERSION_RSVG=2.61.3
2323
VERSION_TIFF=4.7.1
2424
VERSION_VIPS=8.17.3
2525
VERSION_WEBP=1.6.0
2626
VERSION_XML2=2.15.1
27-
VERSION_ZLIB_NG=2.2.5
27+
VERSION_ZLIB_NG=2.3.2

0 commit comments

Comments
 (0)