Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'update_submodules' of https://github.com/MaartenBent/wxWidgets

Browse Source 
Update all 3rd party libraries to the latest versions.

See https://github.com/wxWidgets/wxWidgets/pull/1023
This commit is contained in:
Vadim Zeitlin
2018-11-18 00:57:40 +01:00
parent 29bd2c9274 27d7dd3f00
commit 8dbebf9164
18 changed files with 95 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/catch vendored

Submodule 3rdparty/catch updated: 011f6e6458...b46f260f81

10
Makefile.in
View File

@@ -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

2
build/bakefiles/tiff.bkl
View File

@@ -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
</sources>
</lib>

2
build/cmake/lib/tiff.cmake
View File

@@ -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():

10
build/msw/makefile.bcc
View File

@@ -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

10
build/msw/makefile.gcc
View File

@@ -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) $<

10
build/msw/makefile.vc
View File

@@ -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

6
build/msw/wx_vc7_wxtiff.vcproj
View File

@@ -351,6 +351,9 @@
<File
RelativePath="..\..\src\tiff\libtiff\tif_warning.c">
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_webp.c">
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_win32.c">
</File>
@@ -360,6 +363,9 @@
<File
RelativePath="..\..\src\tiff\libtiff\tif_zip.c">
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_zstd.c">
</File>
</Filter>
</Files>
<Globals>

8
build/msw/wx_vc8_wxtiff.vcproj
View File

@@ -814,6 +814,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_warning.c"
>
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_webp.c"
>
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_win32.c"
>
@@ -826,6 +830,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_zip.c"
>
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_zstd.c"
>
</File>
</Filter>
</Files>
<Globals>

8
build/msw/wx_vc9_wxtiff.vcproj
View File

@@ -810,6 +810,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_warning.c"
>
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_webp.c"
>
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_win32.c"
>
@@ -822,6 +826,10 @@
RelativePath="..\..\src\tiff\libtiff\tif_zip.c"
>
</File>
<File
RelativePath="..\..\src\tiff\libtiff\tif_zstd.c"
>
</File>
</Filter>
</Files>
<Globals>

7
configure vendored
View File

@@ -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

15
configure.in
View File

@@ -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 ------------------------------------------------------------------------

1
docs/changes.txt
View File

@@ -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):

11
docs/contributing/how-to-update-third-party-library.md
View File

@@ -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

6
src/common/imagjpeg.cpp
View File

@@ -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

2
src/expat

Submodule src/expat updated: 6b2e0e6802...b99766ce61

2
src/png

Submodule src/png updated: a016282f47...772e393c7e

2
src/tiff

Submodule src/tiff updated: aa65abe076...c70cb3d7b4