[116164] trunk/dports/gis/grass

[mojca at macports.org]

Revision: 116164
          https://trac.macports.org/changeset/116164
Author:   mojca at macports.org
Date:     2014-01-20 05:50:28 -0800 (Mon, 20 Jan 2014)
Log Message:
-----------
grass: a patch for conflicting is_void (see #40315, fixes a build on clang according to vince)

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

Added Paths:
-----------
    trunk/dports/gis/grass/files/patch-is_void.diff

Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2014-01-20 13:46:28 UTC (rev 116163)
+++ trunk/dports/gis/grass/Portfile	2014-01-20 13:50:28 UTC (rev 116164)
@@ -39,12 +39,13 @@
 
 # https://trac.macports.org/ticket/32790
 # this should probably only apply to some Xcode versions
-compiler.blacklist  *clang*
+# compiler.blacklist  *clang*
 
 patchfiles \
     patch-configure.diff \
     patch-gui-wxpython-core-globalvar.py.diff \
     patch-gui-wxpython-gui_core-ghelp.py.diff \
+    patch-is_void.diff \
     patch-lib-init-grass.src.diff \
     patch-macosx_Makefile.diff \
     patch-Makefile.diff \

Added: trunk/dports/gis/grass/files/patch-is_void.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-is_void.diff	                        (rev 0)
+++ trunk/dports/gis/grass/files/patch-is_void.diff	2014-01-20 13:50:28 UTC (rev 116164)
@@ -0,0 +1,42 @@
+http://trac.osgeo.org/grass/ticket/2170
+
+--- raster/r.terraflow/direction.cc.orig
++++ raster/r.terraflow/direction.cc
+@@ -53,11 +53,11 @@ encodeDirectionMFD(const genericWindow<elevation_type>& elevwin,
+   
+   if(!is_nodata(elevwin.get())) {
+     dir = 0;
+-    if (elevwin.get(5) < elevwin.get() && !is_void(elevwin.get(5))) dir |= 1;
+-    if (elevwin.get(3) < elevwin.get() && !is_void(elevwin.get(3))) dir |= 16;
++    if (elevwin.get(5) < elevwin.get() && !elevation_type_is_void(elevwin.get(5))) dir |= 1;
++    if (elevwin.get(3) < elevwin.get() && !elevation_type_is_void(elevwin.get(3))) dir |= 16;
+     for(int i=0; i<3; i++) {
+-      if(elevwin.get(i) < elevwin.get() && !is_void(elevwin.get(i))) dir |= 32<<i;
+-      if(elevwin.get(i+6) < elevwin.get() && !is_void(elevwin.get(6+i))) dir |= 8>>i;
++      if(elevwin.get(i) < elevwin.get() && !elevation_type_is_void(elevwin.get(i))) dir |= 32<<i;
++      if(elevwin.get(i+6) < elevwin.get() && !elevation_type_is_void(elevwin.get(6+i))) dir |= 8>>i;
+     }
+   }
+   
+--- raster/r.terraflow/nodata.cc.orig
++++ raster/r.terraflow/nodata.cc
+@@ -73,7 +73,7 @@ is_nodata(float x) {
+ 
+ 
+ int
+-is_void(elevation_type el) {
++elevation_type_is_void(elevation_type el) {
+   return (el == nodataType::ELEVATION_NODATA);
+ }
+ 
+--- raster/r.terraflow/nodata.h.orig
++++ raster/r.terraflow/nodata.h
+@@ -37,7 +37,7 @@
+ int is_nodata(elevation_type el);
+ int is_nodata(int x);
+ int is_nodata(float x);
+-int is_void(elevation_type el);
++int elevation_type_is_void(elevation_type el);
+ 
+ 
+ class nodataType : public ijBaseType {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140120/10fc29d7/attachment.html>