Changeset 32249 for gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE

Timestamp:

2018-07-09T21:14:55+12:00 (6 years ago)

Author:

ak19

Message:

All the changes to incorporate libtiff and libjpeg into the xpdftools GS2 extension, to get libjpeg compiled up on 64 bit machines, and for both libs to be seen and used by xpdftools when this is built.

Location:

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE

Files:

• LIBJPEG.sh (added)
• LIBTIFF.sh (added)
• XPDFTOOLS.sh (modified) (4 diffs)

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh

@@ -28 +28 @@
 opt_run_untar $force_untar $auto_untar $package $version
 
-# patch the original tarball with our custom makefile?
+# patch the original tarball with our custom CMake configure/makefile
 if [[ -d "$package$version/xpdf" && -f "gs-CMakeLists.txt" ]]; then
     echo "*******************************************************************"
-    echo "Using our custom gs-CMakeLists.txt instead of the one included in $package$version"
+    echo "Using our custom gs-CMakeLists.txt instead of the one included in the xpdf subfolder of $package$version"
     echo "Renaming gs-CMakeLists.txt to $package$version/xpdf/CMakeLists.txt"
     echo "*******************************************************************"
@@ -70 +70 @@
     cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=$prefix \
+        -DTIFF_INCLUDE_DIR=$prefix/include \
+        -DJPEG_INCLUDE_DIR=$prefix/include \
         -DZLIB_LIBRARY=$prefix/lib/libz.a \
+        -DTIFF_LIBRARY=$prefix/lib/libtiff.a \
         -DPNG_LIBRARY=$prefix/lib/libpng15.a \
+        -DJPEG_LIBRARY=$prefix/lib/libjpeg.a \
         -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.a \
         -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=1 \
@@ -97 +101 @@
 fi
 
+
 ## If compiling statically make sure the above CMake command contains the following
 ## with these values:
 #       -DZLIB_LIBRARY=$prefix/lib/libz.a \
+#       -DTIFF_LIBRARY=$prefix/lib/libtiff.a \
 #       -DPNG_LIBRARY=$prefix/lib/libpng15.a \
+#       -DJPEG_LIBRARY=$prefix/lib/libjpeg.a \
 #       -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.a \
 # and
@@ -106 +113 @@
 
 
-## For building dynamic xpdf-tools executables, change the above to have the following instead:
+## For building dynamic xpdf-tools executables, change the above to have the following instead
+## (still unable get the .so for LIBJPEG generated, so could try JPEG_LIBRARY set same as above)
 #       -DZLIB_LIBRARY=$prefix/lib/libz.so.1.2.7 \
+#       -DTIFF_LIBRARY=$prefix/lib/libtiff.so.5.2.2 \
 #       -DPNG_LIBRARY=$prefix/lib/libpng15.so.15.30.0 \
 #       -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.so.6.3.20 \
 # (The 3rd line can alternatively be "-DFREETYPE_DIR=$prefix")
-# And remove the following line. Don't comment it out, nor set it to "", but remove it:
+# And REMOVE the following line. Don't comment it out, nor set it to "", but remove it:
 #       -DGSDLFLAG_STATIC="$static_flag" \
 
 
 # If compilation was successful, then we don't need cmake binaries anymore when
-# packaging up xpdf-tools
+# packaging up xpdf-tools. Move them away from the distribution area:
 
 if [ -f "$GEXTXPDFTOOLS_INSTALLED/bin/pdftohtml" ]; then