<!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>[118977] trunk/dports/gis/orfeotoolbox</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/118977">118977</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2014-04-14 06:28:00 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>orfeotoolbox: update to version 4.0.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisorfeotoolboxPortfile">trunk/dports/gis/orfeotoolbox/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgisorfeotoolboxfilespatchCode_ApplicationEngine_otbWrapperApplicationhdiff">trunk/dports/gis/orfeotoolbox/files/patch-Code_ApplicationEngine_otbWrapperApplication.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisorfeotoolboxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/orfeotoolbox/Portfile (118976 => 118977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/orfeotoolbox/Portfile 2014-04-14 12:19:40 UTC (rev 118976)
+++ trunk/dports/gis/orfeotoolbox/Portfile 2014-04-14 13:28:00 UTC (rev 118977)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="cx"> name orfeotoolbox
</span><del>-version 3.18.1
</del><ins>+version 4.0.0
</ins><span class="cx"> revision 0
</span><span class="cx"> categories gis graphics
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -24,15 +24,15 @@
</span><span class="cx"> encourage contribution from users and to promote reproducible research.
</span><span class="cx">
</span><span class="cx"> homepage http://www.orfeo-toolbox.org/otb/
</span><del>-master_sites sourceforge:orfeo-toolbox
</del><ins>+master_sites http://orfeo-toolbox.org/packages/
</ins><span class="cx">
</span><span class="cx"> distname OTB-${version}
</span><span class="cx"> extract.suffix .tgz
</span><span class="cx">
</span><del>-checksums rmd160 fcdc8cd68d97b04c4f3f66d65f2fc2e5fb992adb \
- sha256 0cdc7da4a4798b7d6254997321e8d1717e1d774adc0356f33f365b4a446ace2e
</del><ins>+checksums rmd160 90ee3e47a79e2bee9525c1a9cbfa050a78e1c360 \
+ sha256 9875484139b785163c0f0e19e76d458f598fd076b80d0d0aa0e3b59cafcad98e
</ins><span class="cx">
</span><del>-worksrcdir ${worksrcdir}/build
</del><ins>+worksrcdir ${worksrcdir}/../build
</ins><span class="cx"> patch.dir ${workpath}/${distname}
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:tiff \
</span><span class="lines">@@ -40,21 +40,22 @@
</span><span class="cx"> port:libgeotiff \
</span><span class="cx"> port:gdal \
</span><span class="cx"> port:expat \
</span><del>- port:fltk-devel \
</del><span class="cx"> port:boost \
</span><span class="cx"> port:curl \
</span><span class="cx"> port:libkml \
</span><span class="cx"> port:tinyxml \
</span><span class="cx"> port:muparser \
</span><del>- port:gettext \
- port:opencv
</del><ins>+ port:opencv \
+ port:fftw-3
</ins><span class="cx">
</span><span class="cx"> pre-build {
</span><del>- if { ![catch {set installed [lindex [registry_active libsvm] 0]}]} {
- ui_msg "OrfeoToolbox will fail to build because the 'libsvm' port is active. Deactivate"
- ui_msg "'libsvm' by running 'port deactivate libsvm' and try again. You may reactivate"
- ui_msg "'libsvm' after installing OrfeoToolbox by running 'port activate libsvm'."
- return -code error "check is installed"
</del><ins>+ foreach c {libsvm openjpeg15 OpenSceneGraph InsightToolkit} {
+ if { ![catch {set installed [lindex [registry_active $c] 0]}]} {
+ ui_msg "OrfeoToolbox will fail to build because the '$c' port is active. Deactivate"
+ ui_msg "'$c' by running 'port deactivate $c' and try again. You may reactivate"
+ ui_msg "'$c' after installing OrfeoToolbox by running 'port activate $c'."
+ return -code error "check is installed"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,9 +63,11 @@
</span><span class="cx"> file mkdir ${worksrcpath}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+patchfiles-append patch-Code_ApplicationEngine_otbWrapperApplication.h.diff
+
</ins><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><del>-configure.args-append ../ \
</del><ins>+configure.args-append ../${distname}/ \
</ins><span class="cx"> -DBUILD_APPLICATIONS=ON \
</span><span class="cx"> -DBUILD_EXAMPLES=OFF \
</span><span class="cx"> -DBUILD_TESTING=OFF
</span><span class="lines">@@ -74,9 +77,6 @@
</span><span class="cx"> configure.args-delete -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span class="cx"> configure.args-append -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/otb
</span><span class="cx">
</span><del>-# Use external FLTK (internal version is broken)
-configure.args-append -DOTB_USE_EXTERNAL_FLTK=ON
-
</del><span class="cx"> # Use external libs, where available
</span><span class="cx"> configure.args-append -DOTB_USE_EXTERNAL_EXPAT=ON \
</span><span class="cx"> -DOTB_USE_EXTERNAL_BOOST=ON \
</span><span class="lines">@@ -86,23 +86,20 @@
</span><span class="cx"> -DOTB_USE_CURL=ON \
</span><span class="cx"> -DOTB_USE_OPENCV=ON
</span><span class="cx">
</span><del>-# Use internal ITK (MacPorts ITK is outdated, and internal ITK is patched)
</del><ins>+# Use internal ITK (MacPorts ITK is outdated)
</ins><span class="cx"> configure.args-append -DOTB_USE_EXTERNAL_ITK=OFF \
</span><del>- -DITK_USE_REVIEW=ON \
- -DITK_USE_OPTIMIZED_REGISTRATION_METHODS=ON \
- -DOTB_USE_PATENTED=OFF \
- -DITK_USE_PATENTED=OFF
</del><ins>+ -DOTB_USE_PATENTED=OFF
</ins><span class="cx">
</span><span class="cx"> # Use internal openjpeg (OTB needs 2.0 API, but does not support using the external lib yet)
</span><span class="cx"> configure.args-append -DOTB_USE_JPEG2000=ON
</span><span class="cx">
</span><span class="cx"> # Use internal libs (no MacPorts alternatives available)
</span><span class="cx"> configure.args-append -DOTB_USE_EXTERNAL_OPENTHREADS=OFF \
</span><del>- -DOTB_USE_LIBLAS=ON \
- -DOTB_USE_EXTERNAL_LIBLAS=OFF \
</del><span class="cx"> -DOTB_USE_EXTERNAL_OSSIM=OFF \
</span><span class="cx"> -DOTB_USE_SIFTFAST=ON
</span><span class="cx">
</span><ins>+configure.args-append -DITK_USE_FFTWF=OFF
+
</ins><span class="cx"> variant qt4 description {Wrap QT4} {
</span><span class="cx"> depends_lib-append port:qt4-mac
</span><span class="cx"> configure.args-append -DOTB_WRAP_QT=ON
</span><span class="lines">@@ -121,4 +118,6 @@
</span><span class="cx"> -DOTB_INSTALL_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.regex "OTB-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</del><ins>+livecheck.type regex
+livecheck.url ${master_sites}
+livecheck.regex {OTB-(\d+(?:\.\d+)*)\.[tz]}
</ins></span></pre></div>
<a id="trunkdportsgisorfeotoolboxfilespatchCode_ApplicationEngine_otbWrapperApplicationhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/orfeotoolbox/files/patch-Code_ApplicationEngine_otbWrapperApplication.h.diff (0 => 118977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/orfeotoolbox/files/patch-Code_ApplicationEngine_otbWrapperApplication.h.diff (rev 0)
+++ trunk/dports/gis/orfeotoolbox/files/patch-Code_ApplicationEngine_otbWrapperApplication.h.diff 2014-04-14 13:28:00 UTC (rev 118977)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- Code/ApplicationEngine/otbWrapperApplication.h Fri Apr 11 19:55:22 2014 +0200
++++ Code/ApplicationEngine/otbWrapperApplication.h Mon Apr 14 09:18:20 2014 +0200
+@@ -707,7 +707,7 @@
+ if (dynamic_cast<InputImageParameter*>(param))
+ {
+ InputImageParameter* paramDown = dynamic_cast<InputImageParameter*>(param);
+- ret = paramDown->GetImage<TImageType>();
++ ret = dynamic_cast<TImageType*>(paramDown->GetImage());
+ }
+
+ //TODO: exception if not found ?
</ins></span></pre>
</div>
</div>
</body>
</html>