[DebianGIS-dev] r2265 - in packages/gdal-mrsid/trunk: . debian patches

[aboudreault-guest at alioth.debian.org]

Author: aboudreault-guest
Date: 2009-06-06 12:01:06 +0000 (Sat, 06 Jun 2009)
New Revision: 2265

Modified:
   packages/gdal-mrsid/trunk/debian/changelog
   packages/gdal-mrsid/trunk/gdal-mrsid-1.6.1.tar.gz
   packages/gdal-mrsid/trunk/gdal-mrsid-build.in
   packages/gdal-mrsid/trunk/patches/mrsid.patch
Log:
Fixed missing object in Makefile and enabled JPEG2000 support.

Modified: packages/gdal-mrsid/trunk/debian/changelog
===================================================================
--- packages/gdal-mrsid/trunk/debian/changelog	2009-06-04 19:23:36 UTC (rev 2264)
+++ packages/gdal-mrsid/trunk/debian/changelog	2009-06-06 12:01:06 UTC (rev 2265)
@@ -1,3 +1,10 @@
+gdal-mrsid (1.6.1-2)  experimental; urgency=low
+
+  * Fixed mrsid patch to include missing object in Makefile.
+  * Enabled JPEG2000 support.
+
+ -- Alan Boudreault <aboudreault at mapgears.com>  Sat, 06 Jun 2009 07:45:40 -0400
+
 gdal-mrsid (1.6.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/gdal-mrsid/trunk/gdal-mrsid-1.6.1.tar.gz
===================================================================
(Binary files differ)

Modified: packages/gdal-mrsid/trunk/gdal-mrsid-build.in
===================================================================
--- packages/gdal-mrsid/trunk/gdal-mrsid-build.in	2009-06-04 19:23:36 UTC (rev 2264)
+++ packages/gdal-mrsid/trunk/gdal-mrsid-build.in	2009-06-06 12:01:06 UTC (rev 2265)
@@ -62,7 +62,7 @@
 
 echo "Building GDAL/MrSID plugin"
 ( cd $BUILDDIR/gdal-mrsid-$VERSION && \
-         sh ./configure --with-mrsid=$GEOEXPRESSSDK --with-autoload=$PLUGINDIR && \
+         sh ./configure --with-mrsid=$GEOEXPRESSSDK --with-jp2mrsid=yes --with-autoload=$PLUGINDIR && \
         make && \
         make install && chown root:root $PLUGINDIR/gdal_MrSID.so && chmod 0644 $PLUGINDIR/gdal_MrSID.so )
 

Modified: packages/gdal-mrsid/trunk/patches/mrsid.patch
===================================================================
--- packages/gdal-mrsid/trunk/patches/mrsid.patch	2009-06-04 19:23:36 UTC (rev 2264)
+++ packages/gdal-mrsid/trunk/patches/mrsid.patch	2009-06-06 12:01:06 UTC (rev 2265)
@@ -4717,8 +4717,8 @@
 +	rm -fr Makefile config.status config.log autom*.cache
 +
 +
-+$(GLIBNAME):	mrsiddataset.o
-+	$(LD_SHARED) mrsiddataset.o $(LIBS) -o $(GLIBNAME)
++$(GLIBNAME):	mrsiddataset.o mrsidstream.o
++	$(LD_SHARED) mrsiddataset.o mrsidstream.o $(LIBS) -o $(GLIBNAME)
 +
 +%.o:	%.cpp
 +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
@@ -5011,7 +5011,7 @@
 ===================================================================
 --- frmts/mrsid/pkg/README	(revision 0)
 +++ frmts/mrsid/pkg/README	(revision 0)
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,34 @@
 +	Standalone MrSID Drivers for GDAL
 +	===================================
 +
@@ -5033,6 +5033,7 @@
 +
 +./configure --with-gdal=/usr/local/bin/gdal-config \
 +            --with-mrsid=/usr/local/GeoDSDK-7.0    \
++            --with-jp2mrsid=yes
 +            --with-geotiff=[yes or path]  
 +make
 +sudo make install