77d297f3e8
Change-Id: I63fcebc36559c2698bbedd3501285a388ce8c257 Reviewed-on: https://gerrit.libreoffice.org/42291 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
58 lines
2 KiB
Groff
58 lines
2 KiB
Groff
diff -ur jpeg.org/Makefile.am jpeg/Makefile.am
|
|
--- jpeg.org/Makefile.am 2014-11-14 12:05:43.349386578 +0100
|
|
+++ jpeg/Makefile.am 2014-11-14 12:06:21.005387021 +0100
|
|
@@ -174,8 +174,6 @@
|
|
rm -rf `find $(distdir) -name .svn`
|
|
|
|
|
|
-SUBDIRS += md5
|
|
-
|
|
if WITH_12BIT
|
|
|
|
TESTORIG = testorig12.jpg
|
|
diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in
|
|
--- jpeg-turbo.orig/Makefile.in 2015-09-21 20:48:45.000000000 +0200
|
|
+++ jpeg-turbo/Makefile.in 2015-11-22 16:17:10.326527000 +0100
|
|
@@ -405,7 +405,7 @@
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
CSCOPE = cscope
|
|
-DIST_SUBDIRS = java simd md5
|
|
+DIST_SUBDIRS = java simd
|
|
am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
|
|
$(srcdir)/config.h.in $(srcdir)/jconfig.h.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_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 -ru jpeg-turbo.orig/configure jpeg-turbo/configure
|
|
--- jpeg-turbo.orig/configure 2015-09-21 20:48:41.000000000 +0200
|
|
+++ jpeg-turbo/configure 2015-11-22 15:23:25.387071000 +0100
|
|
@@ -14630,9 +14630,7 @@
|
|
$as_echo "yes" >&6; }
|
|
else
|
|
rm -rf conftest*
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
fi
|
|
|
|
|
|
@@ -14828,9 +14826,7 @@
|
|
$as_echo "yes" >&6; }
|
|
else
|
|
rm -rf conftest*
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
fi
|
|
|
|
|