Changeset 32228 for gs2-extensions

Timestamp:

2018-06-29T21:59:19+12:00 (6 years ago)

Author:

ak19

Message:

Tried to compile xpdf-tools up statically with CMake, but still not successful. For now committing modifications necessary (including the new additional packages) for compiling xpdf-tools agains dynamically linked libs of libpng and zlib and freetype. Although these 3 packages have been introduced and are successfully compiled up (and I can even get the CMake configure stage of xpdf-tools to 'see' them), the xpdftools binaries upon successful compilation are shown by ldd to still refer to system versions of zlib, libpng and freetype. Some modifications to a single file in the xpdftools src package were necessary to get things to compile again with these changes, so recommitting the xpdftools src package with modications using the usual gs- prefix and a readme.

Location:

gs2-extensions/xpdf-tools/trunk/src

Files:

• packages/CASCADE-MAKE.sh (modified) (1 diff)
• packages/CASCADE-MAKE/CMAKE.sh (modified) (1 diff)
• packages/CASCADE-MAKE/FREETYPE.sh (added)
• packages/CASCADE-MAKE/LIBPNG.sh (added)
• packages/CASCADE-MAKE/LIBZ.sh (added)
• packages/CASCADE-MAKE/XPDFTOOLS.sh (modified) (6 diffs)
• packages/CMakeLists.txt (added)
• packages/CMakeLists.txt.orig (added)
• packages/CMakeLists.txt.static1_notworking (added)
• packages/CMakeLists.txt.static2_notworking (added)
• packages/CMakeLists.txt_complicated (added)
• packages/freetype-2.3.9.tar.gz (added)
• packages/gs-xpdf-4.00.tar.gz (added)
• packages/libpng-1.5.0.tar.gz (added)
• packages/libpng-1.5.30.tar.gz (added)
• packages/xpdf-4.00.tar.gz (deleted)
• packages/zlib-1.2.7.tar.gz (added)
• setup.bash (modified) (2 diffs)

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

@@ -3 +3 @@
 source ../cascade-make/lib/cascade-lib.bash GEXT_XPDFTOOLS .. $*
 
-#PACKAGES="CMAKE"
-PACKAGES="CMAKE XPDFTOOLS"
+PACKAGES="CMAKE LIBZ LIBPNG FREETYPE XPDFTOOLS"
 
 for d in $PACKAGES ; do

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

@@ -32 +32 @@
 
 # Only compile if necessary - we don't edit these source files.
-if type -p cmake; then
-  echo "found cmake in PATH"
-  _CMAKE=cmake
-elif [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
-##if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
+#if type -p cmake; then
+#  echo "found cmake in PATH"
+#  _CMAKE=cmake
+#elif [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
+# NO. Rather, only compile up OUR cmake if we haven't already got OUR cmake
+# But don't use any system cmake: xpdf-tools is dependent on cmake version (>= 2.8.8)
+if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
   echo "found cmake in $GEXTXPDFTOOLS_INSTALLED/linux/bin"
   _CMAKE="$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake"

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

@@ -2 +2 @@
 
 # only going to make xpdf-tools, not xpdf-reader. So not making all of xpdf
-package=xpdf
+package=gs-xpdf
 version=-4.00
 
@@ -9 +9 @@
 source ../cascade-make/lib/cascade-lib.bash GEXT_XPDFTOOLS ../.. $*
 
+# GEXT XDFTOOLS INSTALLED location is this GEXT's GSDLOS subdir
 prefix=$GEXTXPDFTOOLS_INSTALLED
 
-#export CFLAGS="$CFLAGS -I$GEXTAUDIODB_INSTALLED/include"
-#export CPPFLAGS="$CPPFLAGS -I$GEXTAUDIODB_INSTALLED/include"
-#export CXXFLAGS="$CXXFLAGS -I$GEXTAUDIODB_INSTALLED/include"
-#export LDFLAGS="$LDFLAGS -L$GEXTAUDIODB_INSTALLED/lib"
+# Use C/CPP/CXX FLAGS and LDFLAGS for setting up
+# libpng and libz for compiling xpdftools
+export CFLAGS="$CFLAGS -I$GEXTXPDFTOOLS_INSTALLED/include -I$GEXTXPDFTOOLS_INSTALLED/include/libpng15"
+export CPPFLAGS="$CPPFLAGS -I$GEXTXPDFTOOLS_INSTALLED/include -I$GEXTXPDFTOOLS_INSTALLED/include/libpng15"
+export CXXFLAGS="$CXXFLAGS -I$GEXTXPDFTOOLS_INSTALLED/include -I$GEXTXPDFTOOLS_INSTALLED/include/libpng15"
+export LDFLAGS="$LDFLAGS -L$GEXTXPDFTOOLS_INSTALLED/lib"
 
 #echo GSDLOS = $GSDLOS
@@ -32 +35 @@
 ##exit 0
 
-##if type -p pdftohtml; then
-##  echo "found xpdf-tools in PATH"
-##  _XPDFTOOLS=pdftohtml
-##elif [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/pdftohtml" ]]; then
-if [[ -x "$GEXTXPDFTOOLS_INSTALLED/bin/pdftohtml" ]]; then
-  echo "found pdftohtml in $GEXTXPDFTOOLS_INSTALLED/bin"
-  _XPDFTOOLS="$GEXTXPDFTOOLS_INSTALLED/bin"
-fi
-
-# IGNORE: See xpdf-tools src' INSTALL instructions: need to create a build dir
+# IGNORE: See xpdf-tools src' INSTALL instructions: need to create a 'build' dir
 # cd there and then run cmake from there, providing the xpdf-tools src dir
-# Actually, doing the above breaks the way cascade-lib.bash does it. It wants
-# a 'release' directory, so do it the cascade-make way.
+# ACTUALLY: doing the above breaks the way cascade-lib.bash does it. It wants
+# a 'release' directory, so do it the cascade-make way as that works.
+# TO AVOID building xpdf(reader), turn off finding Qt libs with the cmake flags below
 if [ $force_config = "1" ] ; then
   echo "[pushd $package$version]"
@@ -59 +54 @@
     cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=$prefix \
+        -DZLIB_LIBRARY=$prefix/lib/libz.a \
+        -DPNG_LIBRARY=$prefix/lib/libpng15.a \
+        -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.a \
         -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=1 \
         -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \
@@ -64 +62 @@
         -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
         -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS" \
+        -DPNG_LINK_FLAGS="-lpng15" \
         $GEXT_XPDFTOOLS/packages/$package$version
     fi ; \
@@ -81 +80 @@
   fi
 fi
+
+## The -DFREETYPE_DIR to be used in place of -DFREETYPE_LIBRARY above
+## this will help it find the "libfreetype.so" (no versioning at end) in our gs ext
+## But -DZLIB_DIR and -DPNG_DIR are ignored and unrecognised, whereas
+## -DZLIB_LIBRARY and -DPNG_LIBRARY are recognised & supposedly used when compiling
+## but weren't really used as seen when running ldd on the xpdf-tools binaries:
+#       -DZLIB_DIR=$prefix \
+#       -DPNG_DIR=$prefix \
+#       -DFREETYPE_DIR=$prefix \
+
+## When specified this way, all 3 lines are recognised (freetype, zlib, png)
+## but weren't really used as seen when running ldd on the xpdf-tools binaries:
+#       -DZLIB_LIBRARY=$prefix/lib/libz.so.1.2.7 \
+#       -DPNG_LIBRARY=$prefix/lib/libpng15.so.15.30.0 \
+#       -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.so.6.3.20 \
+
+
+# If compilation was successful, then we don't need cmake binaries anymore when
+# packaging up xpdf-tools

gs2-extensions/xpdf-tools/trunk/src/setup.bash

@@ -1 @@
-# GEXTPARALLELBUILDING
+# GEXT: XPDFTOOLS
 
 extdesc="the Xpdf-Tools Extension"
@@ -58 +58 @@
     export GSDLEXTS=$GSDLEXTS:$extdir
   fi
-
-  echo "+Your environment is now setup for $extdesc in Greenstone"
+  if [ "x$1" != "xsilent" ] ; then
+      echo "+Your environment is now setup for $extdesc in Greenstone"
+  fi
 else
-  echo "+Your environment is already setup for $extdesc in Greenstone"
+    if [ "x$1" != "xsilent" ] ; then
+    echo "+Your environment is already setup for $extdesc in Greenstone"
+    fi
 fi
 
-
+# From http://trac.greenstone.org/browser/other-projects/trunk/realistic-books/setup.bash
+if [ -e devel.sh ] ; then
+    source devel.sh $*
+fi