Show
Ignore:
Timestamp:
09.07.2018 21:14:55 (11 months 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh

    r32248 r32249  
    2828opt_run_untar $force_untar $auto_untar $package $version 
    2929 
    30 # patch the original tarball with our custom makefile? 
     30# patch the original tarball with our custom CMake configure/makefile 
    3131if [[ -d "$package$version/xpdf" && -f "gs-CMakeLists.txt" ]]; then 
    3232    echo "*******************************************************************" 
    33     echo "Using our custom gs-CMakeLists.txt instead of the one included in $package$version" 
     33    echo "Using our custom gs-CMakeLists.txt instead of the one included in the xpdf subfolder of $package$version" 
    3434    echo "Renaming gs-CMakeLists.txt to $package$version/xpdf/CMakeLists.txt" 
    3535    echo "*******************************************************************" 
     
    7070    cmake -DCMAKE_BUILD_TYPE=Release \ 
    7171        -DCMAKE_INSTALL_PREFIX=$prefix \ 
     72        -DTIFF_INCLUDE_DIR=$prefix/include \ 
     73        -DJPEG_INCLUDE_DIR=$prefix/include \ 
    7274        -DZLIB_LIBRARY=$prefix/lib/libz.a \ 
     75        -DTIFF_LIBRARY=$prefix/lib/libtiff.a \ 
    7376        -DPNG_LIBRARY=$prefix/lib/libpng15.a \ 
     77        -DJPEG_LIBRARY=$prefix/lib/libjpeg.a \ 
    7478        -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.a \ 
    7579        -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=1 \ 
     
    97101fi 
    98102 
     103 
    99104## If compiling statically make sure the above CMake command contains the following 
    100105## with these values: 
    101106#       -DZLIB_LIBRARY=$prefix/lib/libz.a \ 
     107#       -DTIFF_LIBRARY=$prefix/lib/libtiff.a \ 
    102108#       -DPNG_LIBRARY=$prefix/lib/libpng15.a \ 
     109#       -DJPEG_LIBRARY=$prefix/lib/libjpeg.a \ 
    103110#       -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.a \ 
    104111# and 
     
    106113 
    107114 
    108 ## For building dynamic xpdf-tools executables, change the above to have the following instead: 
     115## For building dynamic xpdf-tools executables, change the above to have the following instead 
     116## (still unable get the .so for LIBJPEG generated, so could try JPEG_LIBRARY set same as above) 
    109117#       -DZLIB_LIBRARY=$prefix/lib/libz.so.1.2.7 \ 
     118#       -DTIFF_LIBRARY=$prefix/lib/libtiff.so.5.2.2 \ 
    110119#       -DPNG_LIBRARY=$prefix/lib/libpng15.so.15.30.0 \ 
    111120#       -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.so.6.3.20 \ 
    112121# (The 3rd line can alternatively be "-DFREETYPE_DIR=$prefix") 
    113 # And remove the following line. Don't comment it out, nor set it to "", but remove it: 
     122# And REMOVE the following line. Don't comment it out, nor set it to "", but remove it: 
    114123#       -DGSDLFLAG_STATIC="$static_flag" \ 
    115124 
    116125 
    117126# If compilation was successful, then we don't need cmake binaries anymore when 
    118 # packaging up xpdf-tools 
     127# packaging up xpdf-tools. Move them away from the distribution area: 
    119128 
    120129if [ -f "$GEXTXPDFTOOLS_INSTALLED/bin/pdftohtml" ]; then