strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upload libjpeg-turbo 1.5.1

Browse source 
Change-Id: Ie34f030abad75317b8bd813386e6bbf9439a3d1c
Reviewed-on: https://gerrit.libreoffice.org/33810
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon 2017-02-01 10:22:11 +01:00
parent 0e36d7ec60
commit 750ca7dec9
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -77,8 +77,8 @@ export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1
export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7 export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7
export JPEG_TARBALL := jpegsrc.v9a.tar.gz export JPEG_TARBALL := jpegsrc.v9a.tar.gz
export JPEG_TURBO_MD5SUM := 86b0d5f7507c2e6c21c00219162c3c44 export JPEG_TURBO_MD5SUM := 55deb139b0cac3c8200b75d485fc13f3
export JPEG_TURBO_TARBALL := libjpeg-turbo-1.4.2.tar.gz export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.1.tar.gz
export LANGTAGREG_MD5SUM := 8a037dc60b16bf8c5fe871b33390a4a2 export LANGTAGREG_MD5SUM := 8a037dc60b16bf8c5fe871b33390a4a2
export LANGTAGREG_TARBALL := language-subtag-registry-2016-07-19.tar.bz2 export LANGTAGREG_TARBALL := language-subtag-registry-2016-07-19.tar.bz2
export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2

8
external/jpeg-turbo/jpeg-turbo.build.patch.1 vendored
View file

@ -24,10 +24,10 @@ diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in
$(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \ $(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \
@@ -622,7 +622,7 @@ @@ -622,7 +622,7 @@
jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \
jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_3) \ jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_4) \
$(am__append_4) $(am__append_5) $(am__append_10) $(am__append_5) $(am__append_6) $(am__append_11)
-SUBDIRS = java $(am__append_9) md5 -SUBDIRS = java $(am__append_10) md5
+SUBDIRS = java $(am__append_9) +SUBDIRS = java $(am__append_10)
@WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \ @WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \
@WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \ @WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \
@WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \ @WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \

4
external/jpeg-turbo/jpeg-turbo.win_build.patch.1 vendored
View file

@ -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 +++ jpeg-turbo/jconfig.h.in 2016-11-02 22:45:01.905400000 +0100
@@ -71,3 +71,21 @@ @@ -71,3 +71,21 @@
/* The size of `size_t', as computed by sizeof. */ /* Define to `unsigned int' if <sys/types.h> does not define. */
#undef SIZEOF_SIZE_T #undef size_t
+ +
+#ifdef _MSC_VER +#ifdef _MSC_VER
+ +