[ossim] 04/25: Fixed #640819 in 1.7 series.

[Francesco Lovergine]

This is an automated email from the git hooks/post-receive script.

frankie pushed a commit to branch master
in repository ossim.

commit 156759ebbd1cf5fd3e9ecb0ec92aaecdb3e4301e
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 19 09:55:35 2012 +0100

    Fixed #640819 in 1.7 series.
---
 debian/changelog          |   7 +++
 debian/patches/jpeg.patch | 114 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/rules              |   2 +-
 upstream/ossim.tar.gz     | Bin 0 -> 2844544 bytes
 4 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 40dfccf..9e561fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ossim (1.7.21-3) unstable; urgency=low
+
+  * Backport from 1.8 branch: fixig jpeg detection.
+    (closes: #640819)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 19 Mar 2012 09:53:23 +0100
+
 ossim (1.7.21-2) unstable; urgency=low
 
   * Moved to libcurl4-gnutls-dev build-dep.
diff --git a/debian/patches/jpeg.patch b/debian/patches/jpeg.patch
new file mode 100644
index 0000000..dc6912c
--- /dev/null
+++ b/debian/patches/jpeg.patch
@@ -0,0 +1,114 @@
+diff -Nur -x '*.orig' -x '*~' ossim/build-tree/ossim/configure ossim.new/build-tree/ossim/configure
+--- ossim/configure	2009-09-25 13:15:12.000000000 +0200
++++ ossim/configure	2012-03-19 09:52:41.710444046 +0100
+@@ -7707,106 +7707,19 @@
+ fi
+ 
+ 
+-  JPEG_TOP=
+   JPEG_INCLUDE_PATH=
+   JPEG_LIB_PATH=
+-  JPEG_LIBS=
+-
+-  if test "$with_jpeg" = "no" ; then
+-        echo "ERROR: no is not an option as jpeg is required!"
+-    { { echo "$as_me:$LINENO: error: jpeg support required!" >&5
+-echo "$as_me: error: jpeg support required!" >&2;}
+-   { (exit 1); exit 1; }; }
+-  elif test "$with_jpeg" = "" ; then
+-        if test -f "$OSSIM_TOP/../jpeg/jpeglib.h" ; then
+-        JPEG_TOP="$OSSIM_TOP/../jpeg"
+-    elif test -f "$OSSIM_TOP/../jpeg-6b/jpeglib.h" ; then
+-      JPEG_TOP="$OSSIM_TOP/../jpeg-6b"
+-    elif test -f "/usr/include/jpeglib.h" ; then
+-      JPEG_TOP="/usr"
+-    elif test -f "/usr/local/include/jpeglib.h" ; then
+-      JPEG_TOP="/usr/local"
+-    elif test -f "/opt/local/include/jpeglib.h" ; then
+-      JPEG_TOP="/opt/local"
+-    elif test -f "/sw/include/jpeglib.h" ; then
+-      JPEG_TOP="/sw"
+-    else
+-            echo "ERROR: JPEG_TOP not found!"
+-      { { echo "$as_me:$LINENO: error: jpeg support required!" >&5
+-echo "$as_me: error: jpeg support required!" >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
+-  else
+-        JPEG_TOP=$with_jpeg
+-  fi
+-
+-  echo "JPEG_TOP:  $JPEG_TOP"
+-
+-  if test -d "$JPEG_TOP" ; then
+-        if test -f "$JPEG_TOP/include/jpeglib.h" ; then
+-      JPEG_INCLUDE_PATH="-I$JPEG_TOP/include"
+-    elif test -f "$JPEG_TOP/jpeglib.h" ; then
+-      JPEG_INCLUDE_PATH="-I$JPEG_TOP"
+-    else
+-            echo "ERROR: jpeglib.h not found!"
+-      { { echo "$as_me:$LINENO: error: jpeg support required!" >&5
+-echo "$as_me: error: jpeg support required!" >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
+-
+-        if test "$JPEG_INCLUDE_PATH" = "-I/usr/include" ; then
+-      JPEG_INCLUDE_PATH=""
+-    fi
+-
+-        if test -f "$JPEG_TOP/lib/libjpeg.a" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP/lib"
+-    elif test -f "$JPEG_TOP/lib/libjpeg.dll.a" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP/lib"
+-    elif test -f "$JPEG_TOP/lib/libjpeg.lib" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP/lib"
+-    elif test -f "$JPEG_TOP/lib64/libjpeg.a" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP/lib64"
+-    elif test -f "$JPEG_TOP/lib/libjpeg.so" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP/lib"
+-    elif test -f "$JPEG_TOP/libjpeg.a" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP"
+-    elif test -f "$JPEG_TOP/libjpeg.lib" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP"
+-    elif test -f "$JPEG_TOP/libjpeg.so" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP"
+-    elif test -f "$JPEG_TOP/lib64/libjpeg.so" ; then
+-	JPEG_LIB_PATH="-L$JPEG_TOP/lib64"
+-    else
+-            echo "ERROR: libjpeg not found!"
+-      { { echo "$as_me:$LINENO: error: jpeg support required!" >&5
+-echo "$as_me: error: jpeg support required!" >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
+-    JPEG_LIBS=-ljpeg
+-
+-        if test "$JPEG_LIB_PATH" = "-L/usr/lib" ; then
+-      JPEG_LIB_PATH=""
+-    fi
+-
+-    echo "JPEG_INCLUDE_PATH	= $JPEG_INCLUDE_PATH"
+-    echo "JPEG_LIB_PATH	        = $JPEG_LIB_PATH"
+-    echo "JPEG_LIBS	        = $JPEG_LIBS"
+-  else
+-    echo "JPEG_TOP not determined!"
+-    { { echo "$as_me:$LINENO: error: jpeg support required!" >&5
+-echo "$as_me: error: jpeg support required!" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
++  JPEG_LIBS=-ljpeg
+ 
++  echo "JPEG_INCLUDE_PATH	= $JPEG_INCLUDE_PATH"
++  echo "JPEG_LIB_PATH	        = $JPEG_LIB_PATH"
++  echo "JPEG_LIBS	        = $JPEG_LIBS"
+   JPEG_INCLUDE_PATH=$JPEG_INCLUDE_PATH
+-
+   JPEG_LIB_PATH=$JPEG_LIB_PATH
+-
+   JPEG_LIBS=$JPEG_LIBS
+ 
+ 
+ 
+-
+ 
+ # Check whether --with-geotiff was given.
+ if test "${with_geotiff+set}" = set; then
diff --git a/debian/rules b/debian/rules
index ab48c1b..6077d1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ install/ossim-core::
 
 # Add here any variable or target overrides you need.
 
-DEB_CONFIGURE_EXTRA_FLAGS = --prefix=/usr --datadir=/usr/share --includedir=/usr/include --with-jpeg=/usr \
+DEB_CONFIGURE_EXTRA_FLAGS = --prefix=/usr --datadir=/usr/share --includedir=/usr/include --with-jpeg=yes \
                 			--with-libtiff=/usr --with-geotiff=/usr/include/geotiff --with-openthreads= \
 						    --enable-singleSharedOssimLibrary --enable-singleStaticOssimLibrary \
 							--with-freetype=/usr --with-mpi=no $(OPTFLAG) 
diff --git a/upstream/ossim.tar.gz b/upstream/ossim.tar.gz
new file mode 100644
index 0000000..903aa22
Binary files /dev/null and b/upstream/ossim.tar.gz differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git