diff options
| author | David Tardon <dtardon@redhat.com> | 2017-02-01 10:22:11 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-02-01 20:50:41 +0000 |
| commit | 750ca7dec9491e924905b402a662aab6ecc00387 (patch) | |
| tree | 586f02444304cff700b726237788182749eb5d82 | |
| parent | upload cairo 1.14.8 (diff) | |
| download | core-750ca7dec9491e924905b402a662aab6ecc00387.tar.gz core-750ca7dec9491e924905b402a662aab6ecc00387.zip | |
upload libjpeg-turbo 1.5.1
Change-Id: Ie34f030abad75317b8bd813386e6bbf9439a3d1c
Reviewed-on: https://gerrit.libreoffice.org/33810
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/jpeg-turbo/jpeg-turbo.build.patch.1 | 8 | ||||
| -rw-r--r-- | external/jpeg-turbo/jpeg-turbo.win_build.patch.1 | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/download.lst b/download.lst index e04462da4530..bf2ac364930a 100644 --- a/download.lst +++ b/download.lst @@ -77,8 +77,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7 export JPEG_TARBALL := jpegsrc.v9a.tar.gz -export JPEG_TURBO_MD5SUM := 86b0d5f7507c2e6c21c00219162c3c44 -export JPEG_TURBO_TARBALL := libjpeg-turbo-1.4.2.tar.gz +export JPEG_TURBO_MD5SUM := 55deb139b0cac3c8200b75d485fc13f3 +export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.1.tar.gz export LANGTAGREG_MD5SUM := 8a037dc60b16bf8c5fe871b33390a4a2 export LANGTAGREG_TARBALL := language-subtag-registry-2016-07-19.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 diff --git a/external/jpeg-turbo/jpeg-turbo.build.patch.1 b/external/jpeg-turbo/jpeg-turbo.build.patch.1 index 85cd7f645173..4d01ad4b9aed 100644 --- a/external/jpeg-turbo/jpeg-turbo.build.patch.1 +++ b/external/jpeg-turbo/jpeg-turbo.build.patch.1 @@ -24,10 +24,10 @@ diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in $(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \ @@ -622,7 +622,7 @@ jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ - jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_3) \ - $(am__append_4) $(am__append_5) $(am__append_10) --SUBDIRS = java $(am__append_9) md5 -+SUBDIRS = java $(am__append_9) + jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_11) +-SUBDIRS = java $(am__append_10) md5 ++SUBDIRS = java $(am__append_10) @WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \ @WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \ @WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \ diff --git a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 index b5dabaa53ade..00b642703f3a 100644 --- a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 +++ b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 @@ -32,8 +32,8 @@ diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure +++ jpeg-turbo/jconfig.h.in 2016-11-02 22:45:01.905400000 +0100 @@ -71,3 +71,21 @@ - /* The size of `size_t', as computed by sizeof. */ - #undef SIZEOF_SIZE_T + /* Define to `unsigned int' if <sys/types.h> does not define. */ + #undef size_t + +#ifdef _MSC_VER + |