Applied back-ported upstream patch for warping operations; closes bug 314717.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 76 insertions, 5 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 180d33f9f427..85bdf190a76a 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.76 2010/04/05 04:50:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.77 2010/04/12 07:11:44 nerdboy Exp $
+
+*gdal-1.7.1-r1 (12 Apr 2010)
+
+  12 Apr 2010; Steve Arnold <nerdboy@gentoo.org> -gdal-1.7.1.ebuild,
+  +gdal-1.7.1-r1.ebuild, +files/gdal-1.7.1-warp_fix.patch:
+  Applied back-ported upstream patch for warping operations; (closes bug 
+  #314717).
 
 *gdal-1.7.1 (05 Apr 2010)
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 36b6b356d438..5a36d051874d 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -7,6 +7,7 @@ AUX gdal-1.5.2-xerces-64-bit.patch 2002 RMD160 3e8386a5d4127881a299344c36f18e984
 AUX gdal-1.6.0-mysql_ogr_header.patch 545 RMD160 65551255869f26c23be3ba4ed2641643e752323d SHA1 87d09a6a7ab7427f383492c395a5d549f7c10d06 SHA256 876c71bc96aa8f3b82ced23afdd2335955f9e214c9bace700c4919edfb9c4ec2
 AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
 AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea
+AUX gdal-1.7.1-warp_fix.patch 2954 RMD160 76c8897fa4be8e8197016a3a2a0ddc1d326f2498 SHA1 b98c18c634a40d80d54b2c3416d7e06b7a2d8976 SHA256 4ed685891e17e7005457225eac96f455e91e7601ee358f403f112537e744aab5
 DIST gdal-1.5.2.tar.gz 6180070 RMD160 37601decec7cc23ee6ea77c9c0e7c12ef3154213 SHA1 bf759b28d2218919212484c2b593edbc1c09aabb SHA256 243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
 DIST gdal-1.5.3.tar.gz 6194379 RMD160 3178dc1cc76e79071c77ad1cca0c8e23bcb91ef3 SHA1 b8b48f44f8da6e7d5028fe7f57c79e218625b986 SHA256 8f68386582d178842bf990e2e94473ec72c3fd69de2ca757542888f1c95bbf4d
 DIST gdal-1.6.0.tar.gz 7072689 RMD160 85bf968b5ec6c2af5a02597bc4c8375d8f775fec SHA1 cae5a891231ee5794350d1626a688d802a429423 SHA256 acdc2faf7496f8d8f4680347ce30fd3a2139b5c050f13dcd6ca8a3d7f6e418a4
@@ -21,6 +22,6 @@ EBUILD gdal-1.6.1.ebuild 6261 RMD160 6b4d7360e237785bfcefa449ea9d25d14c2787cf SH
 EBUILD gdal-1.6.2.ebuild 6258 RMD160 5a856ad8e38455c0a7acca0806f402b29720f5d1 SHA1 a749df11026604e81d3061f3be0e19e39895d4a0 SHA256 2e51a26f67ae3e1ace3911b3461586e5a95fd0b7f442b514d89ffa6619cd5aab
 EBUILD gdal-1.6.3-r1.ebuild 6648 RMD160 be52cba7820e8a5b422de7f41c1abe2af956f85c SHA1 769769d5725f3f722193ee3815a1e5adbd1c9888 SHA256 0b662812237f148f8db6a951ee590afefc27059c3ad386d5f59f0c3a1ce92e63
 EBUILD gdal-1.6.3.ebuild 6422 RMD160 cf47cde7626034a9b12f5edda669bb49b2640ca0 SHA1 e311209140f40a9ab70df9783c44fcd998045c55 SHA256 1a02068a8c9ba47f2bed2c17a2db4e846a599ae176ee34d8dc14535a9e1b519c
-EBUILD gdal-1.7.1.ebuild 7240 RMD160 1955b8c2e25af77a10f7b6f1a503334f5a2d8bbc SHA1 f3b251eaeba6fd5e6cd5c5d8b92aa17bf2907adb SHA256 c75addd64aa971eb5782cd754d7e37f4b01cae5b1b068fbd1637607e29bf9ed4
-MISC ChangeLog 15024 RMD160 4d10229e0d65e03b2ee7a16289d02a981640f1eb SHA1 44693d9482da2405fe767e2fa6b16b508af0f9bd SHA256 af97eb4e75f9daad28acf0f13052a37770ab5d31a5f52c36af1f40df244cf8de
+EBUILD gdal-1.7.1-r1.ebuild 7284 RMD160 fca460db663d62096314f1e5f52c1ef2ef9351df SHA1 63659d28ca1f99f5af6954efbadd8028f93729f8 SHA256 94a32e18630f08caff9ef998d92a4a69368057b64d5266eb789924ff0e5d3cd9
+MISC ChangeLog 15269 RMD160 53392a27ea298cf7470f719128a325356663624e SHA1 a57c94d6d1147b2517de5b49a741fe97ef821d12 SHA256 85556d36a50020e062362137243dded9ce7b935333b9a54c0487b1ad1a258bd1
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/files/gdal-1.7.1-warp_fix.patch b/sci-libs/gdal/files/gdal-1.7.1-warp_fix.patch
new file mode 100644
index 000000000000..753dcaaf6cb9
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.7.1-warp_fix.patch
@@ -0,0 +1,62 @@
+--- alg/gdalwarper.cpp.orig	2010-04-11 19:20:16.985645233 -0700
++++ alg/gdalwarper.cpp	2010-04-11 19:22:02.711324130 -0700
+@@ -697,6 +697,14 @@
+  * to enable ALL_TOUCHEd mode when rasterizing cutline polygons.  This is
+  * useful to ensure that that all pixels overlapping the cutline polygon
+  * will be selected, not just those whose center point falls within the 
++ *
++ * - OPTIMIZE_SIZE: This defaults to FALSE, but may be set to TRUE when
++ * outputing typically to a compressed dataset (GeoTIFF with COMPRESSED creation
++ * option set for example) for achieving a smaller file size. This is achieved
++ * by writing at once data aligned on full blocks of the target dataset, which
++ * avoids partial writes of compressed blocks and lost space when they are rewritten
++ * at the end of the file. However sticking to target block size may cause major
++ * processing slowdown for some particular reprojections.
+  * polygon.
+  */
+ 
+--- alg/gdalwarpoperation.cpp.orig	2010-04-11 19:11:35.921500930 -0700
++++ alg/gdalwarpoperation.cpp	2010-04-11 19:19:15.691577821 -0700
+@@ -1000,16 +1000,21 @@
+     if( dfTotalMemoryUse > psOptions->dfWarpMemoryLimit 
+         && (nDstXSize > 2 || nDstYSize > 2) )
+     {
++        int bOptimizeSize =
++                CSLFetchBoolean( psOptions->papszWarpOptions, "OPTIMIZE_SIZE", FALSE );

++
+         /* If the region width is greater than the region height, */
+-        /* cut in half in the width. Do this only if each half part */
++        /* cut in half in the width. When we want to optimize the size */
++        /* of a compressed output dataset, do this only if each half part */
+         /* is at least as wide as the block width */
+         if( nDstXSize > nDstYSize &&
+-            (nDstXSize / 2 >= nBlockXSize || nDstYSize == 1) )
++            (!bOptimizeSize ||
++             (bOptimizeSize && (nDstXSize / 2 >= nBlockXSize || nDstYSize == 1))) )
+         {
+             int nChunk1 = nDstXSize / 2;
+             
+-            /* Try to stick on target block boundaries */
+-            if (nChunk1 > nBlockXSize)
++            /* In the optimize size case, try to stick on target block boundaries */
++            if (bOptimizeSize && nChunk1 > nBlockXSize)
+                 nChunk1 = (nChunk1 / nBlockXSize) * nBlockXSize;
+             
+             int nChunk2 = nDstXSize - nChunk1;
+@@ -1026,12 +1031,13 @@
+         else
+         {
+             int nChunk1 = nDstYSize / 2;
+-            int nChunk2 = nDstYSize - nChunk1;
+ 
+-            /* Try to stick on target block boundaries */
+-            if (nChunk1 > nBlockYSize)
++            /* In the optimize size case, try to stick on target block boundaries */
++            if (bOptimizeSize && nChunk1 > nBlockYSize)
+                 nChunk1 = (nChunk1 / nBlockYSize) * nBlockYSize;
+ 
++            int nChunk2 = nDstYSize - nChunk1;
++
+             eErr = CollectChunkList( nDstXOff, nDstYOff, 
+                                      nDstXSize, nChunk1 );
+ 
diff --git a/sci-libs/gdal/gdal-1.7.1.ebuild b/sci-libs/gdal/gdal-1.7.1-r1.ebuild
index f13786d1fb8a..1d2c23b1dc81 100644
--- a/sci-libs/gdal/gdal-1.7.1.ebuild
+++ b/sci-libs/gdal/gdal-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.1.ebuild,v 1.1 2010/04/05 04:50:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.1-r1.ebuild,v 1.1 2010/04/12 07:11:44 nerdboy Exp $
 
 EAPI="2"
 
@@ -83,7 +83,8 @@ src_prepare() {
 	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
 	    "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
-	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch
+	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch \
+	    "${FILESDIR}"/${P}-warp_fix.patch
 
 	if useq hdf && useq netcdf; then
 		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"