From eabeea2a11db42ad0f481fb7f564b79c716cff0e Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Wed, 14 Mar 2018 11:29:48 +0000
Subject: [PATCH] (trunk) hardwire HAVE_{DCT,JPX}_DECODER to 1 (KB)
---
source/libs/poppler/config.h.in | 4 ++--
source/libs/poppler/configure | 20 ++----------------
source/libs/poppler/configure.ac | 36 +++++++++++++++++++-------------
3 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/source/libs/poppler/config.h.in b/source/libs/poppler/config.h.in
index c598ea143..f33427bc4 100644
--- a/source/libs/poppler/config.h.in
+++ b/source/libs/poppler/config.h.in
@@ -6,7 +6,7 @@
/* define if the compiler supports basic C++11 syntax */
#undef HAVE_CXX11
-/* Do we have any DCT decoder?. */
+/* Do we have any DCT decoder? */
#undef HAVE_DCT_DECODER
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
@@ -28,7 +28,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Do we have any JPX decoder?. */
+/* Do we have any JPX decoder? */
#undef HAVE_JPX_DECODER
/* Define to 1 if you have the `localtime_r' function. */
diff --git a/source/libs/poppler/configure b/source/libs/poppler/configure
index 30f45bde6..1bb36bd8b 100755
--- a/source/libs/poppler/configure
+++ b/source/libs/poppler/configure
@@ -750,8 +750,6 @@ enable_opi
enable_multithreaded
enable_exceptions
enable_fixedpoint
-enable_dctdecoder
-enable_libopenjpeg
enable_largefile
with_system_zlib
with_zlib_includes
@@ -1401,8 +1399,6 @@ Optional Features:
--enable-exceptions use C++ exceptions
--enable-fixedpoint use fixed point (instead of floating point)
arithmetic
- --enable-dctdecoder use dctdecoder
- --enable-libopenjpeg use openjpeg decoder
--disable-largefile omit support for large files
Optional Packages:
@@ -7024,27 +7020,15 @@ fi
fi
-# Check whether --enable-dctdecoder was given.
-if test "${enable_dctdecoder+set}" = set; then :
- enableval=$enable_dctdecoder; if test "x$enableval" = xlibjpeg; then
-$as_echo "#define HAVE_DCT_DECODER 1" >>confdefs.h
-
-fi
+# For TL, we just hardware DCT/JPX_DECODER to on.
-fi
+$as_echo "#define HAVE_DCT_DECODER 1" >>confdefs.h
-# Check whether --enable-libopenjpeg was given.
-if test "${enable_libopenjpeg+set}" = set; then :
- enableval=$enable_libopenjpeg; if test "x$enableval" = xopenjpeg2; then
$as_echo "#define HAVE_JPX_DECODER 1" >>confdefs.h
-fi
-
-fi
-
for ac_header in strings.h
diff --git a/source/libs/poppler/configure.ac b/source/libs/poppler/configure.ac
index ff3b2f5ea..cc81285af 100644
--- a/source/libs/poppler/configure.ac
+++ b/source/libs/poppler/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 46373 2018-01-18 23:12:02Z karl $
+dnl $Id: configure.ac 46958 2018-03-14 01:50:06Z karl $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Copyright 2018 Karl Berry <tex-live@tug.org>
@@ -69,21 +69,27 @@ AC_ARG_ENABLE([fixedpoint],
fi
])
-AC_ARG_ENABLE([dctdecoder],
- AS_HELP_STRING([--enable-dctdecoder],
- [use dctdecoder]),
- [if test "x$enableval" = xlibjpeg; then
- AC_DEFINE([HAVE_DCT_DECODER], 1, [Do we have any DCT decoder?.])
-fi
-])
-AC_ARG_ENABLE([libopenjpeg],
- AS_HELP_STRING([--enable-libopenjpeg],
- [use openjpeg decoder]),
- [if test "x$enableval" = xopenjpeg2; then
- AC_DEFINE([HAVE_JPX_DECODER], 1, [Do we have any JPX decoder?.])
-fi
-])
+# For TL, we just hardware DCT/JPX_DECODER to on.
+AC_DEFINE([HAVE_DCT_DECODER], 1, [Do we have any DCT decoder?])
+dnl
+dnl AC_ARG_ENABLE([dctdecoder],
+dnl AS_HELP_STRING([--enable-dctdecoder],
+dnl [use dctdecoder]),
+dnl [if test "x$enableval" = xlibjpeg; then
+dnl AC_DEFINE([HAVE_DCT_DECODER], 1, [Do we have any DCT decoder?])
+dnl fi
+dnl ])
+
+AC_DEFINE([HAVE_JPX_DECODER], 1, [Do we have any JPX decoder?])
+dnl
+dnl AC_ARG_ENABLE([libopenjpeg],
+dnl AS_HELP_STRING([--enable-libopenjpeg],
+dnl [use openjpeg decoder]),
+dnl [if test "x$enableval" = xopenjpeg2; then
+dnl AC_DEFINE([HAVE_JPX_DECODER], 1, [Do we have any JPX decoder?])
+dnl fi
+dnl ])
dnl **** Checks for header files ****
--
GitLab