diff --git a/3rdparty/catch b/3rdparty/catch
index 011f6e6458..b46f260f81 160000
--- a/3rdparty/catch
+++ b/3rdparty/catch
@@ -1 +1 @@
-Subproject commit 011f6e6458d888246f94643e293f002073cff489
+Subproject commit b46f260f810bb693825c026269636e82b0a50722
diff --git a/Makefile.in b/Makefile.in
index 04eaa957f2..e44bc57695 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -206,8 +206,10 @@ WXTIFF_OBJECTS = \
wxtiff_tif_tile.o \
wxtiff_tif_version.o \
wxtiff_tif_warning.o \
+ wxtiff_tif_webp.o \
wxtiff_tif_write.o \
- wxtiff_tif_zip.o
+ wxtiff_tif_zip.o \
+ wxtiff_tif_zstd.o
WXEXPAT_CFLAGS = -DNDEBUG -I./src/expat/expat -DHAVE_EXPAT_CONFIG_H \
$(____SHARED) $(CPPFLAGS) $(CFLAGS)
WXEXPAT_OBJECTS = \
@@ -15026,12 +15028,18 @@ wxtiff_tif_version.o: $(srcdir)/src/tiff/libtiff/tif_version.c
wxtiff_tif_warning.o: $(srcdir)/src/tiff/libtiff/tif_warning.c
$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_warning.c
+wxtiff_tif_webp.o: $(srcdir)/src/tiff/libtiff/tif_webp.c
+ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_webp.c
+
wxtiff_tif_write.o: $(srcdir)/src/tiff/libtiff/tif_write.c
$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_write.c
wxtiff_tif_zip.o: $(srcdir)/src/tiff/libtiff/tif_zip.c
$(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_zip.c
+wxtiff_tif_zstd.o: $(srcdir)/src/tiff/libtiff/tif_zstd.c
+ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_zstd.c
+
@COND_PLATFORM_UNIX_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/libtiff/tif_unix.c
@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_unix.c
diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index df6629e34f..ae321f4439 100644
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -93,8 +93,10 @@
src/tiff/libtiff/tif_tile.c
src/tiff/libtiff/tif_version.c
src/tiff/libtiff/tif_warning.c
+ src/tiff/libtiff/tif_webp.c
src/tiff/libtiff/tif_write.c
src/tiff/libtiff/tif_zip.c
+ src/tiff/libtiff/tif_zstd.c
diff --git a/build/cmake/lib/tiff.cmake b/build/cmake/lib/tiff.cmake
index d1ef8d51f6..289390db73 100644
--- a/build/cmake/lib/tiff.cmake
+++ b/build/cmake/lib/tiff.cmake
@@ -59,8 +59,10 @@ if(wxUSE_LIBTIFF STREQUAL "builtin")
src/tiff/libtiff/tif_tile.c
src/tiff/libtiff/tif_version.c
src/tiff/libtiff/tif_warning.c
+ src/tiff/libtiff/tif_webp.c
src/tiff/libtiff/tif_write.c
src/tiff/libtiff/tif_zip.c
+ src/tiff/libtiff/tif_zstd.c
)
if(WIN32)
# define this to get rid of a warning about using POSIX lfind():
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 24a3687ebe..8112f30f89 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -185,8 +185,10 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_tile.obj \
$(OBJS)\wxtiff_tif_version.obj \
$(OBJS)\wxtiff_tif_warning.obj \
+ $(OBJS)\wxtiff_tif_webp.obj \
$(OBJS)\wxtiff_tif_write.obj \
- $(OBJS)\wxtiff_tif_zip.obj
+ $(OBJS)\wxtiff_tif_zip.obj \
+ $(OBJS)\wxtiff_tif_zstd.obj
WXEXPAT_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I$(LIBDIRNAME) -w-8004 -w-8008 \
-w-8012 -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS)
@@ -5950,12 +5952,18 @@ $(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\libtiff\tif_version.c
$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\libtiff\tif_warning.c
$(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_warning.c
+$(OBJS)\wxtiff_tif_webp.obj: ..\..\src\tiff\libtiff\tif_webp.c
+ $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_webp.c
+
$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\libtiff\tif_write.c
$(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_write.c
$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\libtiff\tif_zip.c
$(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_zip.c
+$(OBJS)\wxtiff_tif_zstd.obj: ..\..\src\tiff\libtiff\tif_zstd.c
+ $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_zstd.c
+
$(OBJS)\wxexpat_xmlparse.obj: ..\..\src\expat\expat\lib\xmlparse.c
$(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\expat\lib\xmlparse.c
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 18792ec66d..c6a2042c6b 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -174,8 +174,10 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_tile.o \
$(OBJS)\wxtiff_tif_version.o \
$(OBJS)\wxtiff_tif_warning.o \
+ $(OBJS)\wxtiff_tif_webp.o \
$(OBJS)\wxtiff_tif_write.o \
- $(OBJS)\wxtiff_tif_zip.o
+ $(OBJS)\wxtiff_tif_zip.o \
+ $(OBJS)\wxtiff_tif_zstd.o
WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -DNDEBUG -I$(LIBDIRNAME) $(CPPFLAGS) $(CFLAGS)
WXEXPAT_OBJECTS = \
@@ -6132,12 +6134,18 @@ $(OBJS)\wxtiff_tif_version.o: ../../src/tiff/libtiff/tif_version.c
$(OBJS)\wxtiff_tif_warning.o: ../../src/tiff/libtiff/tif_warning.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
+$(OBJS)\wxtiff_tif_webp.o: ../../src/tiff/libtiff/tif_webp.c
+ $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
+
$(OBJS)\wxtiff_tif_write.o: ../../src/tiff/libtiff/tif_write.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
$(OBJS)\wxtiff_tif_zip.o: ../../src/tiff/libtiff/tif_zip.c
$(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
+$(OBJS)\wxtiff_tif_zstd.o: ../../src/tiff/libtiff/tif_zstd.c
+ $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
+
$(OBJS)\wxexpat_xmlparse.o: ../../src/expat/expat/lib/xmlparse.c
$(CC) -c -o $@ $(WXEXPAT_CFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 60db1ec578..c1ce7f10bd 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -191,8 +191,10 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_tile.obj \
$(OBJS)\wxtiff_tif_version.obj \
$(OBJS)\wxtiff_tif_warning.obj \
+ $(OBJS)\wxtiff_tif_webp.obj \
$(OBJS)\wxtiff_tif_write.obj \
- $(OBJS)\wxtiff_tif_zip.obj
+ $(OBJS)\wxtiff_tif_zip.obj \
+ $(OBJS)\wxtiff_tif_zstd.obj
WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
@@ -6659,12 +6661,18 @@ $(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\libtiff\tif_version.c
$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\libtiff\tif_warning.c
$(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_warning.c
+$(OBJS)\wxtiff_tif_webp.obj: ..\..\src\tiff\libtiff\tif_webp.c
+ $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_webp.c
+
$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\libtiff\tif_write.c
$(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_write.c
$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\libtiff\tif_zip.c
$(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_zip.c
+$(OBJS)\wxtiff_tif_zstd.obj: ..\..\src\tiff\libtiff\tif_zstd.c
+ $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_zstd.c
+
$(OBJS)\wxexpat_xmlparse.obj: ..\..\src\expat\expat\lib\xmlparse.c
$(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\expat\lib\xmlparse.c
diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj
index 24ff2fe8e7..e38387d7e3 100644
--- a/build/msw/wx_vc7_wxtiff.vcproj
+++ b/build/msw/wx_vc7_wxtiff.vcproj
@@ -351,6 +351,9 @@
+
+
@@ -360,6 +363,9 @@
+
+
diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj
index a0dd040d57..ad88651710 100644
--- a/build/msw/wx_vc8_wxtiff.vcproj
+++ b/build/msw/wx_vc8_wxtiff.vcproj
@@ -814,6 +814,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_warning.c"
>
+
+
@@ -826,6 +830,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_zip.c"
>
+
+
diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj
index 98b10bf9d5..bd58142dbc 100644
--- a/build/msw/wx_vc9_wxtiff.vcproj
+++ b/build/msw/wx_vc9_wxtiff.vcproj
@@ -810,6 +810,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_warning.c"
>
+
+
@@ -822,6 +826,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_zip.c"
>
+
+
diff --git a/configure b/configure
index 2378cc74fd..18146f9527 100755
--- a/configure
+++ b/configure
@@ -23373,8 +23373,11 @@ fi
fi
fi
-if test "$wxUSE_LIBLZMA" = "no" -a "$wxUSE_LIBTIFF" = "builtin"; then
- ac_configure_args="$ac_configure_args --disable-lzma"
+if test "$wxUSE_LIBTIFF" = "builtin"; then
+ ac_configure_args="$ac_configure_args --disable-webp --disable-zstd"
+ if test "$wxUSE_LIBLZMA" = "no"; then
+ ac_configure_args="$ac_configure_args --disable-lzma"
+ fi
fi
diff --git a/configure.in b/configure.in
index 1159b013c6..2c91781ff0 100644
--- a/configure.in
+++ b/configure.in
@@ -2585,12 +2585,15 @@ if test "$wxUSE_LIBLZMA" != "no"; then
fi
fi
-dnl We need to disable the use of lzma in built-in libtiff explicitly, as
-dnl otherwise we'd depend on the system lzma library, which is typically
-dnl undesirable when using builtin libraries. We also disable the use of lzma
-dnl if it's not available anyhow, just to speed up libtiff configure a little.
-if test "$wxUSE_LIBLZMA" = "no" -a "$wxUSE_LIBTIFF" = "builtin"; then
- ac_configure_args="$ac_configure_args --disable-lzma"
+dnl Disable the use of lzma, webp and zstd in built-in libtiff explicitly, as
+dnl otherwise we'd depend on the system libraries, which is typically
+dnl undesirable when using builtin libraries. If we use lzma ourselves, keep it
+dnl enabled.
+if test "$wxUSE_LIBTIFF" = "builtin"; then
+ ac_configure_args="$ac_configure_args --disable-webp --disable-zstd"
+ if test "$wxUSE_LIBLZMA" = "no"; then
+ ac_configure_args="$ac_configure_args --disable-lzma"
+ fi
fi
dnl ------------------------------------------------------------------------
diff --git a/docs/changes.txt b/docs/changes.txt
index 6f7dd41b18..99f65b57d3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -115,6 +115,7 @@ All:
- Avoid spurious errors on thread creation under NetBSD.
- Improve high DPI support in wxAui (Simon Rozman).
- Fix a bug with parsing time zones in wxDateTime::ParseFormat() (evileye).
+- Update all 3rd party libraries to their latest versions (Maarten Bent).
All (GUI):
diff --git a/docs/contributing/how-to-update-third-party-library.md b/docs/contributing/how-to-update-third-party-library.md
index ad9dde29bd..0736502714 100644
--- a/docs/contributing/how-to-update-third-party-library.md
+++ b/docs/contributing/how-to-update-third-party-library.md
@@ -42,7 +42,14 @@ one:
$ git push --set-upstream git@github.com:wxWidgets/libexpat.git wx
-3. Updating the main repository
+3. Generating build files (libexpat, libtiff)
+---------------------------------------------
+
+We include the generated build files of libexpat and libtiff. For libexpat run
+`buildconf.sh`. For libtiff run `autogen.sh`. Commit the changes.
+
+
+4. Updating the main repository
-------------------------------
If there are any changes to the source files used by the library, update the
@@ -54,7 +61,7 @@ manually.
Commit these changes and the submodule and create a PR to test them as usual.
-4. Special instructions for libpng
+5. Special instructions for libpng
----------------------------------
We use a special hack for libpng as we want to prefix all its symbols with
diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index df9893c44d..7fbb97ce5e 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -505,7 +505,11 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
/*static*/ wxVersionInfo wxJPEGHandler::GetLibraryVersionInfo()
{
- return wxVersionInfo("libjpeg", JPEG_LIB_VERSION/10, JPEG_LIB_VERSION%10);
+#if defined(JPEG_LIB_VERSION_MAJOR) && defined(JPEG_LIB_VERSION_MINOR)
+ return wxVersionInfo("libjpeg", JPEG_LIB_VERSION_MAJOR, JPEG_LIB_VERSION_MINOR);
+#else
+ return wxVersionInfo("libjpeg", JPEG_LIB_VERSION / 10, JPEG_LIB_VERSION % 10);
+#endif
}
#endif // wxUSE_LIBJPEG
diff --git a/src/expat b/src/expat
index 6b2e0e6802..b99766ce61 160000
--- a/src/expat
+++ b/src/expat
@@ -1 +1 @@
-Subproject commit 6b2e0e680289cdf92839b2a3f8b0735c84dc9326
+Subproject commit b99766ce61f2cefa0ada22204765c1bf08802216
diff --git a/src/png b/src/png
index a016282f47..772e393c7e 160000
--- a/src/png
+++ b/src/png
@@ -1 +1 @@
-Subproject commit a016282f4752b1177da5722efda7e3045a4ecdf1
+Subproject commit 772e393c7eb95f0424d2d895abd5f8ad0131f500
diff --git a/src/tiff b/src/tiff
index aa65abe076..c70cb3d7b4 160000
--- a/src/tiff
+++ b/src/tiff
@@ -1 +1 @@
-Subproject commit aa65abe0762209d40ec5d4343ec426a4d67caf2d
+Subproject commit c70cb3d7b4c861083cdc0b6f245f3830c6e42566