Skip to content

Commit

Permalink
Bump libpng, libxml2 and zlib
Browse files Browse the repository at this point in the history
Also fix rav1e in the docker image after
#2117
  • Loading branch information
vrabaud committed Apr 17, 2024
1 parent d939897 commit 3f61f66
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmake/Modules/LocalLibXml2.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(AVIF_LOCAL_LIBXML_GIT_TAG "v2.11.5")
set(AVIF_LOCAL_LIBXML_GIT_TAG "v2.12.6")

set(LIB_FILENAME "${AVIF_SOURCE_DIR}/ext/libxml2/install.libavif/lib/${AVIF_LIBRARY_PREFIX}xml2${CMAKE_STATIC_LIBRARY_SUFFIX}")
if(EXISTS "${LIB_FILENAME}")
Expand Down
4 changes: 2 additions & 2 deletions cmake/Modules/LocalZlibpng.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(AVIF_LOCAL_ZLIB_GIT_TAG v1.3)
set(AVIF_LOCAL_LIBPNG_GIT_TAG v1.6.40)
set(AVIF_LOCAL_ZLIB_GIT_TAG v1.3.1)
set(AVIF_LOCAL_LIBPNG_GIT_TAG v1.6.43)

if(EXISTS "${AVIF_SOURCE_DIR}/ext/zlib")
message(STATUS "libavif(AVIF_ZLIBPNG=LOCAL): ext/zlib found; using as FetchContent SOURCE_DIR")
Expand Down
2 changes: 1 addition & 1 deletion ext/libxml2.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

: # libxml2 is released under the MIT License.

git clone -b v2.11.5 --depth 1 https://gitlab.gnome.org/GNOME/libxml2.git
git clone -b v2.12.6 --depth 1 https://gitlab.gnome.org/GNOME/libxml2.git

mkdir -p libxml2/build.libavif
cmake libxml2 -B libxml2/build.libavif/ -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=libxml2/install.libavif \
Expand Down
4 changes: 2 additions & 2 deletions ext/zlibpng.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

: # The odd choice of comment style in this file is to try to share this script between *nix and win32.

git clone -b v1.3 --depth 1 https://github.com/madler/zlib.git
git clone -b v1.6.40 --depth 1 https://github.com/glennrp/libpng.git
git clone -b v1.3.1 --depth 1 https://github.com/madler/zlib.git
git clone -b v1.6.43 --depth 1 https://github.com/glennrp/libpng.git

0 comments on commit 3f61f66

Please sign in to comment.