<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[116694] trunk/dports/gis/gdal</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/116694">116694</a></dd>
<dt>Author</dt> <dd>macsforever2000@macports.org</dd>
<dt>Date</dt> <dd>2014-02-03 13:01:55 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gdal: Fix mrsid variant. Update for latest geoexpress-sdk. (#36496)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalPortfile">trunk/dports/gis/gdal/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalfilespatchfrmts_mrsid_mrsiddatasetcpp">trunk/dports/gis/gdal/files/patch-frmts_mrsid_mrsiddataset.cpp</a></li>
<li><a href="#trunkdportsgisgdalfilespatchmrsidconfigure">trunk/dports/gis/gdal/files/patch-mrsid-configure</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgdalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/Portfile (116693 => 116694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2014-02-03 20:34:40 UTC (rev 116693)
+++ trunk/dports/gis/gdal/Portfile 2014-02-03 21:01:55 UTC (rev 116694)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gdal
</span><span class="cx"> version 1.10.1
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories gis
</span><span class="cx"> license MIT BSD
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -135,11 +135,7 @@
</span><span class="cx"> variant mrsid description {Enable MrSID file format} {
</span><span class="cx"> depends_lib-append port:geoexpress-sdk
</span><span class="cx"> configure.args-delete --without-mrsid
</span><del>- configure.args-append --with-mrsid=${prefix}/share/Geo_DSDK
-
- # Fixes for Geo_DSDK 7.x - http://trac.osgeo.org/gdal/ticket/2410
- patchfiles-append patch-frmts_mrsid_mrsiddataset.cpp \
- patch-mrsid-configure
</del><ins>+ configure.args-append --with-mrsid=${prefix}/share/Geo_DSDK/Raster_DSDK
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant hdf4 description {Enable HDF4 file format} {
</span><span class="lines">@@ -323,6 +319,36 @@
</span><span class="cx"> xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} HOWTO-RELEASE NEWS VERSION \
</span><span class="cx"> ${destroot}${prefix}/share/doc/${name}
</span><ins>+
+ if {[variant_isset mrsid]} {
+ foreach f [list \
+ bin/gdal_contour \
+ bin/gdal_grid \
+ bin/gdal_rasterize \
+ bin/gdal_translate \
+ bin/gdaladdo \
+ bin/gdalbuildvrt \
+ bin/gdaldem \
+ bin/gdalenhance \
+ bin/gdalinfo \
+ bin/gdallocationinfo \
+ bin/gdalmanage \
+ bin/gdalserver \
+ bin/gdalsrsinfo \
+ bin/gdaltindex \
+ bin/gdaltransform \
+ bin/gdalwarp \
+ bin/nearblack \
+ bin/ogr2ogr \
+ bin/ogrinfo \
+ bin/ogrtindex \
+ bin/testepsg \
+ lib/libgdal.1.dylib] \
+ {
+ exec install_name_tool -change libltidsdk.9.dylib ${prefix}/share/Geo_DSDK/Raster_DSDK/lib/libltidsdk.9.dylib ${destroot}${prefix}/${f}
+ }
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportsgisgdalfilespatchfrmts_mrsid_mrsiddatasetcpp"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gis/gdal/files/patch-frmts_mrsid_mrsiddataset.cpp (116693 => 116694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-frmts_mrsid_mrsiddataset.cpp 2014-02-03 20:34:40 UTC (rev 116693)
+++ trunk/dports/gis/gdal/files/patch-frmts_mrsid_mrsiddataset.cpp 2014-02-03 21:01:55 UTC (rev 116694)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>---- frmts/mrsid/mrsiddataset.cpp.orig 2008-08-14 23:59:18.000000000 -0700
-+++ frmts/mrsid/mrsiddataset.cpp 2008-08-15 00:05:20.000000000 -0700
-@@ -1,5 +1,5 @@
- /******************************************************************************
-- * $Id: mrsiddataset.cpp 12686 2007-11-09 19:31:29Z warmerdam $
-+ * $Id$
- *
- * Project: Multi-resolution Seamless Image Database (MrSID)
- * Purpose: Read/write LizardTech's MrSID file format - Version 4+ SDK.
-@@ -37,7 +37,7 @@
- #include <geo_normalize.h>
- #include <geovalues.h>
-
--CPL_CVSID("$Id: mrsiddataset.cpp 12686 2007-11-09 19:31:29Z warmerdam $");
-+CPL_CVSID("$Id$");
-
- CPL_C_START
- double GTIFAngleToDD( double dfAngle, int nUOMAngle );
-@@ -161,7 +161,11 @@
- {
- friend class MrSIDRasterBand;
-
-+#if defined(LTI_SDK_MAJOR) && LTI_SDK_MAJOR >= 7
-+ MrSIDImageReader *poImageReader;
-+#else
- LTIImageReader *poImageReader;
-+#endif
-
- #ifdef MRSID_ESDK
- LTIGeoFileImageWriter *poImageWriter;
-@@ -690,7 +694,14 @@
- if ( poLTINav )
- delete poLTINav;
- if ( poImageReader && !bIsOverview )
-+#if defined(LTI_SDK_MAJOR) && LTI_SDK_MAJOR >= 7
-+ {
-+ poImageReader->release();
-+ poImageReader = NULL;
-+ }
-+#else
- delete poImageReader;
-+#endif
-
- if ( pszProjection )
- CPLFree( pszProjection );
-@@ -1250,6 +1261,7 @@
- /* -------------------------------------------------------------------- */
- MrSIDDataset *poDS;
- const LTFileSpec oFileSpec( poOpenInfo->pszFilename );
-+ LT_STATUS eStat;
-
- poDS = new MrSIDDataset();
- #ifdef MRSID_J2K
-@@ -1257,9 +1269,21 @@
- poDS->poImageReader = new LTIDLLReader<J2KImageReader>( oFileSpec, true );
- else
- #endif
-+#if defined(LTI_SDK_MAJOR) && LTI_SDK_MAJOR >= 7
-+ {
-+ poDS->poImageReader = MrSIDImageReader::create();
-+ }
-+
-+ eStat = poDS->poImageReader->initialize( oFileSpec, true );
-+#else
-+ {
- poDS->poImageReader = new LTIDLLReader<MrSIDImageReader>( oFileSpec, false );
-+ }
-+
-+ eStat = poDS->poImageReader->initialize();
-+#endif
-
-- if ( !LT_SUCCESS( poDS->poImageReader->initialize() ) )
-+ if ( !LT_SUCCESS(eStat) )
- {
- delete poDS;
- CPLError( CE_Failure, CPLE_AppDefined,
</del></span></pre></div>
<a id="trunkdportsgisgdalfilespatchmrsidconfigure"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gis/gdal/files/patch-mrsid-configure (116693 => 116694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-mrsid-configure 2014-02-03 20:34:40 UTC (rev 116693)
+++ trunk/dports/gis/gdal/files/patch-mrsid-configure 2014-02-03 21:01:55 UTC (rev 116694)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>---- configure.orig 2008-08-15 00:00:41.000000000 -0700
-+++ configure 2008-08-15 00:01:24.000000000 -0700
-@@ -23184,12 +23184,12 @@
-
- { echo "$as_me:$LINENO: checking for lt_base.h in $with_mrsid/include/support" >&5
- echo $ECHO_N "checking for lt_base.h in $with_mrsid/include/support... $ECHO_C" >&6; }
-- if test -r "$with_mrsid/include/support/lt_base.h" ; then
-+ if test -r "$with_mrsid/include/lt_base.h" ; then
- { echo "$as_me:$LINENO: result: found MrSID DSDK version 4.x or newer." >&5
- echo "${ECHO_T}found MrSID DSDK version 4.x or newer." >&6; }
-
- HAVE_MRSID=yes
-- MRSID_INCLUDE="-I$with_mrsid/include/base -I$with_mrsid/include/metadata -I$with_mrsid/include/mrsid_readers -I$with_mrsid/include/j2k_readers -I$with_mrsid/include/support"
-+ MRSID_INCLUDE="-I$with_mrsid/include"
- MRSID_LIBS="-lltidsdk -lpthread"
-
- { echo "$as_me:$LINENO: checking for MG3ImageWriter.h in $with_mrsid/include/mrsid_writers" >&5
</del></span></pre>
</div>
</div>
</body>
</html>