diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
| commit | 940b4d1848e8c70ab7642901a68594e8016caffc (patch) | |
| tree | eb72f344ee6c3d9b80a7ecc079ea79e9fba8676d /external/libjpeg-turbo/jpeg-turbo.build.patch.1 | |
| parent | Initial commit. (diff) | |
| download | libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.tar.xz libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.zip | |
Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/libjpeg-turbo/jpeg-turbo.build.patch.1')
| -rw-r--r-- | external/libjpeg-turbo/jpeg-turbo.build.patch.1 | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/external/libjpeg-turbo/jpeg-turbo.build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.build.patch.1 new file mode 100644 index 000000000..4d01ad4b9 --- /dev/null +++ b/external/libjpeg-turbo/jpeg-turbo.build.patch.1 @@ -0,0 +1,58 @@ +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 + + |