[138789] trunk/dports/gis/gdal

[vince at macports.org]

Revision: 138789
          https://trac.macports.org/changeset/138789
Author:   vince at macports.org
Date:     2015-07-19 05:23:00 -0700 (Sun, 19 Jul 2015)
Log Message:
-----------
gdal: bump to 2.0.0

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

Added Paths:
-----------
    trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff
    trunk/dports/gis/gdal/files/patch-ogr_p_h.diff

Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/gis/gdal/Portfile	2015-07-19 08:27:57 UTC (rev 138788)
+++ trunk/dports/gis/gdal/Portfile	2015-07-19 12:23:00 UTC (rev 138789)
@@ -5,8 +5,7 @@
 PortGroup           mpi 1.0
 
 name                gdal
-version             1.11.2
-revision            2
+version             2.0.0
 categories          gis
 license             MIT BSD
 platforms           darwin
@@ -28,8 +27,8 @@
                     http://download.osgeo.org/gdal/ \
                     http://download.osgeo.org/gdal/CURRENT/
 
-checksums           rmd160  25e2f52e287d22830098fc45c7e8ac7023180de1 \
-                    sha256  66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845
+checksums           rmd160  9cd43eb416d05373d505d5739d76a369c96df045 \
+                    sha256  53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6
 
 compilers.choose    cc cxx
 mpi.setup
@@ -107,7 +106,9 @@
                     patch-pdfcreatecopy_h.diff \
                     patch-pdfcreatecopy_cpp.diff \
                     patch-alg_GNUmakefile.diff \
-                    patch-apps_GNUmakefile.diff
+                    patch-apps_GNUmakefile.diff \
+                    patch-ogr_p_h.diff \
+                    patch-ogr_api_cpp.diff
 
 # Patches for universal build
 post-configure {
@@ -312,8 +313,8 @@
 
 # Perf variant to optimize code
 variant perf description {Optimize for speed} {
-    configure.cflags        -O3 -pipe -march=native
-    configure.cxxflags      -O3 -pipe -march=native
+    configure.cflags        -O3 -pipe -march=native -DGDAL_COMPILATION
+    configure.cxxflags      -O3 -pipe -march=native -DGDAL_COMPILATION
 }
 
 default_variants    +expat
@@ -359,7 +360,7 @@
             bin/ogrlineref \
             bin/ogrtindex \
             bin/testepsg \
-            lib/libgdal.1.dylib] \
+            lib/libgdal.20.dylib] \
             {
                 exec install_name_tool -change libltidsdk.9.dylib ${prefix}/share/Geo_DSDK/Raster_DSDK/lib/libltidsdk.9.dylib ${destroot}${prefix}/${f}
             }
@@ -389,7 +390,7 @@
             bin/ogrlineref \
             bin/ogrtindex \
             bin/testepsg \
-            lib/libgdal.1.dylib] \
+            lib/libgdal.20.dylib] \
             {
                 if {${configure.cxx_stdlib} == "libc++"} {
                     exec install_name_tool -change \

Added: trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff
===================================================================
--- trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff	                        (rev 0)
+++ trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff	2015-07-19 12:23:00 UTC (rev 138789)
@@ -0,0 +1,11 @@
+--- ogr/ogr_api.cpp.old	2015-07-19 13:37:31.000000000 +0200
++++ ogr/ogr_api.cpp	2015-07-19 13:36:10.000000000 +0200
+@@ -33,6 +33,8 @@
+ #include "ogr_api.h"
+ #include "cpl_error.h"
+ 
++#define OGR_ENABLED
++
+ static int bNonLinearGeometriesEnabled = TRUE;
+ 
+ /************************************************************************/

Added: trunk/dports/gis/gdal/files/patch-ogr_p_h.diff
===================================================================
--- trunk/dports/gis/gdal/files/patch-ogr_p_h.diff	                        (rev 0)
+++ trunk/dports/gis/gdal/files/patch-ogr_p_h.diff	2015-07-19 12:23:00 UTC (rev 138789)
@@ -0,0 +1,11 @@
+--- ogr/ogr_p.h.old	2015-07-19 12:42:55.000000000 +0200
++++ ogr/ogr_p.h	2015-07-19 12:26:52.000000000 +0200
+@@ -31,6 +31,8 @@
+ #ifndef OGR_P_H_INCLUDED
+ #define OGR_P_H_INCLUDED
+ 
++#include "gdal.h"
++
+ /* -------------------------------------------------------------------- */
+ /*      Include the common portability library ... lets us do lots      */
+ /*      of stuff easily.                                                */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150719/f65230c2/attachment-0001.html>