[118977] trunk/dports/gis/orfeotoolbox

stromnov at macports.org stromnov at macports.org
Mon Apr 14 06:28:00 PDT 2014


Revision: 118977
          https://trac.macports.org/changeset/118977
Author:   stromnov at macports.org
Date:     2014-04-14 06:28:00 -0700 (Mon, 14 Apr 2014)
Log Message:
-----------
orfeotoolbox: update to version 4.0.0

Modified Paths:
--------------
    trunk/dports/gis/orfeotoolbox/Portfile

Added Paths:
-----------
    trunk/dports/gis/orfeotoolbox/files/patch-Code_ApplicationEngine_otbWrapperApplication.h.diff

Modified: trunk/dports/gis/orfeotoolbox/Portfile
===================================================================
--- 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)
@@ -6,7 +6,7 @@
 PortGroup           qt4 1.0
 
 name                orfeotoolbox
-version             3.18.1
+version             4.0.0
 revision            0
 categories          gis graphics
 platforms           darwin
@@ -24,15 +24,15 @@
                     encourage contribution from users and to promote reproducible research.
 
 homepage            http://www.orfeo-toolbox.org/otb/
-master_sites        sourceforge:orfeo-toolbox
+master_sites        http://orfeo-toolbox.org/packages/
 
 distname            OTB-${version}
 extract.suffix      .tgz
 
-checksums           rmd160  fcdc8cd68d97b04c4f3f66d65f2fc2e5fb992adb \
-                    sha256  0cdc7da4a4798b7d6254997321e8d1717e1d774adc0356f33f365b4a446ace2e
+checksums           rmd160  90ee3e47a79e2bee9525c1a9cbfa050a78e1c360 \
+                    sha256  9875484139b785163c0f0e19e76d458f598fd076b80d0d0aa0e3b59cafcad98e
 
-worksrcdir          ${worksrcdir}/build
+worksrcdir          ${worksrcdir}/../build
 patch.dir           ${workpath}/${distname}
 
 depends_lib-append  port:tiff \
@@ -40,21 +40,22 @@
                     port:libgeotiff \
                     port:gdal \
                     port:expat \
-                    port:fltk-devel \
                     port:boost \
                     port:curl \
                     port:libkml \
                     port:tinyxml \
                     port:muparser \
-                    port:gettext \
-                    port:opencv
+                    port:opencv \
+                    port:fftw-3
 
 pre-build {
-    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"
+    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"
+        }
     }
 }
 
@@ -62,9 +63,11 @@
     file mkdir ${worksrcpath}
 }
 
+patchfiles-append       patch-Code_ApplicationEngine_otbWrapperApplication.h.diff
+
 use_parallel_build      no
 
-configure.args-append   ../ \
+configure.args-append   ../${distname}/ \
                         -DBUILD_APPLICATIONS=ON \
                         -DBUILD_EXAMPLES=OFF \
                         -DBUILD_TESTING=OFF
@@ -74,9 +77,6 @@
 configure.args-delete   -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
 configure.args-append   -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/otb
 
-# Use external FLTK (internal version is broken)
-configure.args-append   -DOTB_USE_EXTERNAL_FLTK=ON
-
 # Use external libs, where available
 configure.args-append   -DOTB_USE_EXTERNAL_EXPAT=ON \
                         -DOTB_USE_EXTERNAL_BOOST=ON \
@@ -86,23 +86,20 @@
                         -DOTB_USE_CURL=ON \
                         -DOTB_USE_OPENCV=ON
 
-# Use internal ITK (MacPorts ITK is outdated, and internal ITK is patched)
+# Use internal ITK (MacPorts ITK is outdated)
 configure.args-append   -DOTB_USE_EXTERNAL_ITK=OFF \
-                        -DITK_USE_REVIEW=ON \
-                        -DITK_USE_OPTIMIZED_REGISTRATION_METHODS=ON \
-                        -DOTB_USE_PATENTED=OFF \
-                        -DITK_USE_PATENTED=OFF
+                        -DOTB_USE_PATENTED=OFF
 
 # Use internal openjpeg (OTB needs 2.0 API, but does not support using the external lib yet)
 configure.args-append   -DOTB_USE_JPEG2000=ON
 
 # Use internal libs (no MacPorts alternatives available)
 configure.args-append   -DOTB_USE_EXTERNAL_OPENTHREADS=OFF \
-                        -DOTB_USE_LIBLAS=ON \
-                        -DOTB_USE_EXTERNAL_LIBLAS=OFF \
                         -DOTB_USE_EXTERNAL_OSSIM=OFF \
                         -DOTB_USE_SIFTFAST=ON
 
+configure.args-append   -DITK_USE_FFTWF=OFF
+
 variant qt4 description {Wrap QT4} {
     depends_lib-append      port:qt4-mac
     configure.args-append   -DOTB_WRAP_QT=ON
@@ -121,4 +118,6 @@
                             -DOTB_INSTALL_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
 }
 
-livecheck.regex     "OTB-(\\d+(?:\\.\\d+)*)${extract.suffix}"
+livecheck.type      regex
+livecheck.url       ${master_sites}
+livecheck.regex     {OTB-(\d+(?:\.\d+)*)\.[tz]}

Added: trunk/dports/gis/orfeotoolbox/files/patch-Code_ApplicationEngine_otbWrapperApplication.h.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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 ?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140414/b1a8c1a0/attachment.html>


More information about the macports-changes mailing list