diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-02 14:13:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-02 20:04:23 +0000 |
| commit | eea709f67d91e271e3df37e6c6724b7b5870b1ee (patch) | |
| tree | 170d8daf2c45e04f461556ede40699d3d6a4fc2c /external | |
| parent | 092261ffd497f752c342f1fbdca6e7267e312a21 (diff) | |
poppler: build against libjpeg
Albert Astals Cid points out that --disable-libjpeg causes poppler to
use internal JPEG code instead, which is not actively maintained.
Add LIBJPEG_CFLAGS / LIBJPEG_LIBS to config_host.mk and patch poppler to
respect LIBJPEG_LIBS.
Change-Id: Id19a62a9bd9dc41fee5e8e43e2798e515aacc299
Reviewed-on: https://gerrit.libreoffice.org/30496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/poppler/ExternalProject_poppler.mk | 2 | ||||
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 1 | ||||
| -rw-r--r-- | external/poppler/poppler-libjpeg.patch.1 | 23 |
3 files changed, 25 insertions, 1 deletions
diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk index eab1d9181c61..f75dddc114cd 100644 --- a/external/poppler/ExternalProject_poppler.mk +++ b/external/poppler/ExternalProject_poppler.mk @@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) : --disable-poppler-cpp \ --disable-libopenjpeg \ --disable-libtiff \ - --disable-libjpeg \ + --enable-libjpeg \ --disable-libpng \ --disable-zlib \ --disable-libcurl \ diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index a0b6595ca0c6..afad5fba13b6 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-vs2013.patch.1 \ external/poppler/poppler-0.46.0-std-max.patch.1 \ external/poppler/ubsan.patch.0 \ + external/poppler/poppler-libjpeg.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/poppler/poppler-libjpeg.patch.1 b/external/poppler/poppler-libjpeg.patch.1 new file mode 100644 index 000000000000..c8d54beb75ae --- /dev/null +++ b/external/poppler/poppler-libjpeg.patch.1 @@ -0,0 +1,23 @@ +do not override user supplied LIBJPEG_LIBS so we can use the one in WORKDIR + +--- poppler/configure.orig 2016-11-02 13:58:32.530617038 +0100 ++++ poppler/configure 2016-11-02 13:58:06.233617689 +0100 +@@ -21377,8 +21377,9 @@ + ac_save_USER_INCLUDES="$USER_INCLUDES" + ac_save_USER_LDFLAGS="$USER_LDFLAGS" + USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS" +- USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_CFLAGS" ++ USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_LIBS" + ++if test -z "$LIBJPEG_LIBS"; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5 + $as_echo_n "checking for libjpeg6b... " >&6; } +@@ -21489,6 +21490,7 @@ + + + fi ++fi + + + ac_save_CPPFLAGS="$CPPFLAGS" |