summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-02-01 10:22:11 +0100
committerDavid Tardon <dtardon@redhat.com>2017-02-01 20:50:41 +0000
commit750ca7dec9491e924905b402a662aab6ecc00387 (patch)
tree586f02444304cff700b726237788182749eb5d82 /external
parent0e36d7ec6020c380c00955b2c13f279690184685 (diff)
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>
Diffstat (limited to 'external')
-rw-r--r--external/jpeg-turbo/jpeg-turbo.build.patch.18
-rw-r--r--external/jpeg-turbo/jpeg-turbo.win_build.patch.14
2 files changed, 6 insertions, 6 deletions
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
+