Skip to content

Commit

Permalink
bump vendored libpng from 1.6.40 to 1.6.41 and zlib from 1.3 to 1.3.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
sezero committed Jan 29, 2024
1 parent 44823bc commit 2a63464
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[submodule "external/libpng"]
path = external/libpng
url = https://github.com/libsdl-org/libpng.git
branch = v1.6.40-SDL
branch = v1.6.41-SDL
[submodule "external/libwebp"]
path = external/libwebp
url = https://github.com/libsdl-org/libwebp.git
Expand All @@ -17,7 +17,7 @@
[submodule "external/zlib"]
path = external/zlib
url = https://github.com/libsdl-org/zlib.git
branch = v1.3-SDL
branch = v1.3.1-SDL
[submodule "external/libjxl"]
path = external/libjxl
url = https://github.com/libsdl-org/libjxl.git
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ if(SDL2IMAGE_ZLIB)
message(STATUS "${PROJECT_NAME}: Using vendored zlib")
sdl_check_project_in_subfolder(external/zlib zlib SDL2IMAGE_VENDORED)
add_subdirectory(external/zlib EXCLUDE_FROM_ALL)
# disable build of zlib example programs:
set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "zlib examples" FORCE)
# PNG_BUILD_ZLIB variable is used by vendored libpng
set(PNG_BUILD_ZLIB ON CACHE BOOL "libpng option to tell it should use 'our' vendored ZLIB library" FORCE)
# ZLIB_INCLUDE_DIR variable is used by vendored libpng
Expand Down
2 changes: 1 addition & 1 deletion external/libpng
Submodule libpng updated 96 files
+3 −3 .appveyor.yml
+17 −16 .gitignore
+9 −11 .travis.yml
+5 −0 .yamllint.yml
+37 −13 ANNOUNCE
+19 −11 AUTHORS
+32 −0 CHANGES
+220 −201 CMakeLists.txt
+2 −2 LICENSE
+40 −6 Makefile.am
+217 −100 Makefile.in
+1 −1 README
+7 −7 aclocal.m4
+7 −2 android/pnglibconf.h
+3 −2 autogen.sh
+11 −0 ci/.shellcheckrc
+19 −0 ci/LICENSE_MIT.txt
+88 −0 ci/ci_lint_ci.sh
+85 −71 ci/ci_verify_cmake.sh
+80 −60 ci/ci_verify_configure.sh
+54 −45 ci/ci_verify_makefiles.sh
+90 −0 ci/lib/ci.lib.sh
+83 −24 config.guess
+18 −6 config.h.in
+156 −80 config.sub
+1,186 −698 configure
+145 −5 configure.ac
+142 −0 contrib/mips-mmi/linux.c
+23 −35 contrib/mips-msa/linux.c
+11 −0 contrib/pngminus/.gitignore
+2 −1 contrib/pngminus/CHANGES.txt
+35 −18 contrib/pngminus/CMakeLists.txt
+91 −131 contrib/pngminus/png2pnm.c
+273 −230 contrib/pngminus/pnm2png.c
+0 −0 contrib/pngminus/test_png2pnm.bat
+0 −0 contrib/pngminus/test_png2pnm.sh
+0 −0 contrib/pngminus/test_pngminus.bat
+0 −0 contrib/pngminus/test_pngminus.sh
+0 −0 contrib/pngminus/test_pnm2png.bat
+0 −0 contrib/pngminus/test_pnm2png.sh
+ contrib/testpngs/badpal/regression-palette-8.png
+ contrib/testpngs/badpal/small-palette-1.png
+ contrib/testpngs/badpal/small-palette-2.png
+ contrib/testpngs/badpal/small-palette-4.png
+ contrib/testpngs/badpal/small-palette-8.png
+ contrib/testpngs/badpal/test-palette-1.png
+ contrib/testpngs/badpal/test-palette-2.png
+ contrib/testpngs/badpal/test-palette-4.png
+ contrib/testpngs/badpal/test-palette-8.png
+1 −1 contrib/testpngs/makepngs.sh
+1 −1 contrib/tools/intgamma.sh
+11 −21 contrib/tools/pngcp.c
+17 −21 contrib/tools/pngfix.c
+19 −19 example.c
+4 −4 install-sh
+7 −7 libpng-manual.txt
+9 −9 libpng.3
+2 −2 libpngpf.3
+412 −0 loongarch/filter_lsx_intrinsics.c
+65 −0 loongarch/loongarch_lsx_init.c
+525 −0 mips/filter_mmi_inline_assembly.c
+7 −7 mips/filter_msa_intrinsics.c
+80 −6 mips/mips_init.c
+1 −1 png.5
+14 −59 png.c
+27 −23 png.h
+2 −2 pngconf.h
+14 −20 pngerror.c
+126 −119 pngget.c
+4 −4 pngpread.c
+93 −17 pngpriv.h
+5 −3 pngread.c
+3 −3 pngrtran.c
+9 −10 pngrutil.c
+16 −6 pngset.c
+32 −32 pngtest.c
+9 −5 pngtrans.c
+14 −5 pngwrite.c
+5 −5 pngwutil.c
+7 −0 scripts/autoconf/README.md
+0 −0 scripts/autoconf/libtool.m4
+0 −0 scripts/autoconf/ltoptions.m4
+0 −0 scripts/autoconf/ltsugar.m4
+0 −0 scripts/autoconf/ltversion.m4
+0 −0 scripts/autoconf/lt~obsolete.m4
+35 −0 scripts/cmake/AUTHORS.md
+35 −0 scripts/cmake/README.md
+10 −6 scripts/cmake/genchk.cmake.in
+10 −6 scripts/cmake/genout.cmake.in
+16 −10 scripts/cmake/gensrc.cmake.in
+10 −7 scripts/cmake/test.cmake.in
+1 −1 scripts/libpng-config-head.in
+1 −1 scripts/libpng.pc.in
+78 −1 scripts/pnglibconf.dfa
+7 −2 scripts/pnglibconf.h.prebuilt
+88 −11 tests/pngtest-all
2 changes: 1 addition & 1 deletion external/zlib
Submodule zlib updated 73 files
+11 −1 .gitignore
+24 −19 CMakeLists.txt
+10 −0 ChangeLog
+1 −2 FAQ
+8 −8 Makefile.in
+3 −3 README
+5 −4 configure
+1 −1 contrib/delphi/ZLib.pas
+1 −1 contrib/dotzlib/DotZLib/ChecksumImpl.cs
+1 −1 contrib/dotzlib/DotZLib/UnitTests.cs
+3 −3 contrib/infback9/inftree9.c
+2 −2 contrib/infback9/inftree9.h
+2 −2 contrib/iostream3/zfstream.h
+1 −1 contrib/minizip/Makefile
+1 −1 contrib/minizip/configure.ac
+1 −1 contrib/minizip/ioapi.h
+16 −2 contrib/minizip/miniunz.c
+4 −4 contrib/minizip/unzip.c
+1 −1 contrib/minizip/unzip.h
+16 −5 contrib/minizip/zip.c
+2 −2 contrib/minizip/zip.h
+43 −0 contrib/nuget/nuget.csproj
+22 −0 contrib/nuget/nuget.sln
+1 −1 contrib/pascal/zlibpas.pas
+4 −4 contrib/puff/puff.c
+81 −75 contrib/vstudio/readme.txt
+4 −4 contrib/vstudio/vc10/zlib.rc
+1 −1 contrib/vstudio/vc10/zlibvc.def
+4 −4 contrib/vstudio/vc11/zlib.rc
+1 −1 contrib/vstudio/vc11/zlibvc.def
+4 −4 contrib/vstudio/vc12/zlib.rc
+1 −1 contrib/vstudio/vc12/zlibvc.def
+4 −4 contrib/vstudio/vc14/zlib.rc
+1 −1 contrib/vstudio/vc14/zlibvc.def
+409 −0 contrib/vstudio/vc17/miniunz.vcxproj
+405 −0 contrib/vstudio/vc17/minizip.vcxproj
+473 −0 contrib/vstudio/vc17/testzlib.vcxproj
+409 −0 contrib/vstudio/vc17/testzlibdll.vcxproj
+32 −0 contrib/vstudio/vc17/zlib.rc
+602 −0 contrib/vstudio/vc17/zlibstat.vcxproj
+158 −0 contrib/vstudio/vc17/zlibvc.def
+179 −0 contrib/vstudio/vc17/zlibvc.sln
+875 −0 contrib/vstudio/vc17/zlibvc.vcxproj
+4 −4 contrib/vstudio/vc9/zlib.rc
+1 −1 contrib/vstudio/vc9/zlibvc.def
+36 −11 deflate.c
+33 −2 deflate.h
+1 −1 doc/algorithm.txt
+2 −2 examples/gzlog.c
+1 −1 examples/zran.c
+2 −6 gzguts.h
+6 −6 gzlib.c
+1 −1 inflate.c
+3 −3 inftrees.c
+2 −2 inftrees.h
+1 −1 old/visual-basic.txt
+1 −1 os400/README400
+3 −3 os400/zlib.inc
+5 −5 qnx/package.qpg
+13 −12 test/example.c
+16 −16 test/minigzip.c
+2 −2 treebuild.xml
+17 −3 trees.c
+2 −18 win32/DLL_FAQ.txt
+4 −4 win32/README-WIN32.txt
+1 −9 zconf.h
+1 −9 zconf.h.cmakein
+1 −9 zconf.h.in
+3 −3 zlib.3
+ zlib.3.pdf
+11 −11 zlib.h
+100 −100 zlib.map
+3 −24 zutil.h

0 comments on commit 2a63464

Please sign in to comment.