poppler 0.55: patch for JPX decoder.

build-shared.sh

@@ -229,7 +229,7 @@ if [ "$WARNINGS" = "max" ]
 then
     rm -f source/texk/web2c/luatexdir/luatex_svnversion.h
 fi
-## not needed anymore
+## Not used anymore
 ##( cd source  ; ./texk/web2c/luatexdir/getluatexsvnversion.sh )
 
 
@@ -253,7 +253,7 @@ TL_MAKE=$MAKE ../source/configure  $CONFHOST $CONFBUILD  $WARNINGFLAGS\
     --disable-ipc \
     --enable-dump-share  \
     --enable-web2c  \
-    --enable-dctdecoder=libjpeg \
+    --enable-dctdecoder=libjpeg --enable-libopenjpeg=openjpeg2 \
     --enable-luatex $JITENABLE \
     --without-system-ptexenc \
     --without-system-kpathsea \

build.sh

@@ -256,7 +256,7 @@ TL_MAKE=$MAKE ../source/configure  $CONFHOST $CONFBUILD  $WARNINGFLAGS\
     --enable-dump-share  \
     --enable-coremp  \
     --enable-web2c  \
-    --enable-dctdecoder=libjpeg \
+    --enable-dctdecoder=libjpeg --enable-libopenjpeg=openjpeg2 \
     --enable-luatex $JITENABLE \
     --without-system-cairo  \
     --without-system-pixman \

source/libs/poppler/config.h.in

@@ -25,6 +25,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Do we have any JPX decoder?. */
+#undef HAVE_JPX_DECODER
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

source/libs/poppler/configure

@@ -751,6 +751,7 @@ enable_multithreaded
 enable_exceptions
 enable_fixedpoint
 enable_dctdecoder
+enable_libopenjpeg
 enable_largefile
 with_system_zlib
 with_zlib_includes
@@ -1412,6 +1413,7 @@ Optional Features:
   --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:
@@ -6056,6 +6058,21 @@ fi
 fi
 
 
+# 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
+
+
+
+
+
+--enable-libopenjpeg=[auto/openjpeg1/openjpeg2
 
 
 

source/libs/poppler/configure.ac

@@ -72,6 +72,18 @@ AC_ARG_ENABLE([dctdecoder],
 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
+])
+
+
+
+
+--enable-libopenjpeg=@<:@auto/openjpeg1/openjpeg2
 
 
 

source/texk/web2c/luatexdir/luatex_svnversion.h

-#define luatex_svn_revision 6371
+#define luatex_svn_revision 6374