Update libwebp, SDL2, libpng, and zlib

- Update libwep to 1.3.2 - Update SDL2 to 2.28.3 - Update libpng to 1.6.40 - Update zlib to 1.3
nCine · Sep 15, 2023 · 1e56d57 · 1e56d57
1 parent 369091e
commit 1e56d57
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/cmake/png.cmake b/cmake/png.cmake
@@ -3,8 +3,8 @@ if(NOT DEFINED TARGET_ZLIB)
 endif()
 
 set(TARGET_PNG png)
-set(URL_PNG http://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz)
-set(URL_MD5_PNG 6c7519f6c75939efa0ed3053197abd54)
+set(URL_PNG http://downloads.sourceforge.net/project/libpng/libpng16/1.6.40/libpng-1.6.40.tar.gz)
+set(URL_MD5_PNG ec4b597c3a9b1f8d2826575f530367b7)
 set(LIBNAME_PNG libpng16)
 set(COMMON_CMAKE_ARGS_PNG -DPNG_BUILD_ZLIB=ON -DPNG_TESTS=OFF)
 set(BUILDDIR_ZLIB ${EP_BASE}/Build/project_${TARGET_ZLIB})
@@ -28,7 +28,7 @@ if(MSVC)
 		DEPENDS project_${TARGET_ZLIB}
 		URL ${URL_PNG}
 		URL_MD5 ${URL_MD5_PNG}
-		CMAKE_ARGS -DZLIB_LIBRARY=${BUILDDIR_ZLIB}/${LIBFILE_ZLIB_IMPLIB} -DZLIB_INCLUDE_DIR=${BUILDDIR_ZLIB} ${COMMON_CMAKE_ARGS_PNG} -DSKIP_INSTALL_ALL=1
+		CMAKE_ARGS -DZLIB_LIBRARIES=${BUILDDIR_ZLIB}/${LIBFILE_ZLIB_IMPLIB} -DZLIB_INCLUDE_DIRS=${BUILDDIR_ZLIB} ${COMMON_CMAKE_ARGS_PNG} -DSKIP_INSTALL_ALL=1
 		BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} --parallel
 		BUILD_IN_SOURCE 0
 		INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LIBFILE_PNG_NOEXT}.dll ${BINDIR}/
@@ -41,16 +41,16 @@ if(MSVC)
 elseif(APPLE)
 	set(FRAMEWORK_DIR_PNG ${DESTINATION_PATH}/${TARGET_PNG}.framework)
 	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-		set(DYLIBNAME_PNG libpng16d.16.37.0.dylib)
+		set(DYLIBNAME_PNG libpng16d.16.40.0.dylib)
 	else()
-		set(DYLIBNAME_PNG libpng16.16.37.0.dylib)
+		set(DYLIBNAME_PNG libpng16.16.40.0.dylib)
 	endif()
 
 	ExternalProject_Add(project_${TARGET_PNG}
 		DEPENDS project_${TARGET_ZLIB}
 		URL ${URL_PNG}
 		URL_MD5 ${URL_MD5_PNG}
-		CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DZLIB_LIBRARY=${BUILDDIR_ZLIB}/${DYLIBNAME_ZLIB} -DZLIB_INCLUDE_DIR=${BUILDDIR_ZLIB} ${COMMON_CMAKE_ARGS_PNG}
+		CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DZLIB_LIBRARIES=${BUILDDIR_ZLIB}/${DYLIBNAME_ZLIB} -DZLIB_INCLUDE_DIRS=${BUILDDIR_ZLIB} ${COMMON_CMAKE_ARGS_PNG}
 		BUILD_COMMAND ${CMAKE_COMMAND} --build . --parallel
 		BUILD_IN_SOURCE 0
 		INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORK_DIR_PNG}/Versions/A
@@ -69,7 +69,7 @@ elseif(NOT EMSCRIPTEN)
 		DEPENDS project_${TARGET_ZLIB}
 		URL ${URL_PNG}
 		URL_MD5 ${URL_MD5_PNG}
-		CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DZLIB_LIBRARY=${BUILDDIR_ZLIB}/${LIBNAME_ZLIB} -DZLIB_INCLUDE_DIR=${BUILDDIR_ZLIB} ${COMMON_CMAKE_ARGS_PNG} -DCMAKE_INSTALL_PREFIX=${DESTINATION_PATH}
+		CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DZLIB_LIBRARIES=${BUILDDIR_ZLIB}/${LIBNAME_ZLIB} -DZLIB_INCLUDE_DIRS=${BUILDDIR_ZLIB} ${COMMON_CMAKE_ARGS_PNG} -DCMAKE_INSTALL_PREFIX=${DESTINATION_PATH}
 		BUILD_COMMAND ${CMAKE_COMMAND} --build . --parallel
 		BUILD_IN_SOURCE 0
 		INSTALL_COMMAND make install

diff --git a/cmake/sdl2.cmake b/cmake/sdl2.cmake
@@ -1,6 +1,6 @@
 set(TARGET_SDL2 sdl2)
-set(URL_SDL2 https://www.libsdl.org/release/SDL2-2.28.2.tar.gz)
-set(URL_MD5_SDL2 06ff379c406cd8318d18f0de81ee2709)
+set(URL_SDL2 https://www.libsdl.org/release/SDL2-2.28.3.tar.gz)
+set(URL_MD5_SDL2 a9cd672b63386d1f57074a4896045d54)
 set(LIBNAME_SDL2 SDL2)
 set(LIBNAME_SDL2MAIN SDL2main)
 

diff --git a/cmake/webp.cmake b/cmake/webp.cmake
@@ -1,6 +1,6 @@
 set(TARGET_WEBP webp)
-set(URL_WEBP http://downloads.webmproject.org/releases/webp/libwebp-1.3.1.tar.gz)
-set(URL_MD5_WEBP 0ff59e5598753f47519e3e61c12f8cfd)
+set(URL_WEBP http://downloads.webmproject.org/releases/webp/libwebp-1.3.2.tar.gz)
+set(URL_MD5_WEBP 34869086761c0e2da6361035f7b64771)
 set(LIBNAME_WEBP libwebp)
 set(LIBNAME_SHARPYUV libsharpyuv)
 set(LIBNAME_WEBPDECODER libwebpdecoder)

diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
@@ -1,6 +1,6 @@
 set(TARGET_ZLIB zlib)
-set(URL_ZLIB https://www.zlib.net/zlib-1.2.13.tar.gz)
-set(URL_MD5_ZLIB 9b8aa094c4e5765dabf4da391f00d15c)
+set(URL_ZLIB https://www.zlib.net/zlib-1.3.tar.gz)
+set(URL_MD5_ZLIB 60373b133d630f74f4a1f94c1185a53f)
 set(LIBNAME_ZLIB zlib)
 
 if(MSVC)
@@ -35,7 +35,7 @@ if(MSVC)
 	)
 elseif(APPLE)
 	set(FRAMEWORK_DIR_ZLIB ${DESTINATION_PATH}/${TARGET_ZLIB}.framework)
-	set(DYLIBNAME_ZLIB libz.1.2.13.dylib)
+	set(DYLIBNAME_ZLIB libz.1.3.dylib)
 
 	ExternalProject_Add(project_${TARGET_ZLIB}
 		URL ${URL_ZLIB}