gdal 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: efd2479353115fa849e01a0b9c4429e12486dc69
-  data.tar.gz: f0dc55bec95189756a0178d5a0783c2653bb09ea
+SHA256:
+  metadata.gz: 92af36896abf24956b9873c20633e4eef5b807d00480edb8a5aa81081387c36c
+  data.tar.gz: 5de734af3b9fe6e3046333e2014486a7848e519a7aca5ee226e4956ac4104af7
 SHA512:
-  metadata.gz: 17038000eb84539bc04a01018861f7928971d2f58539f905b5abcc2c8d6a9d9666aa2a50983d6f4a7139df1de792a31279cc9114e2c68a54bc348946339c57e9
-  data.tar.gz: 6e70d3e50ba2a3a9b7a687004522d4bff78db58c840eb2bb2a315a81367e57546cfc03c0935b149119254f33689c4c143a19378f87b67f641eb6349ecec797cd
+  metadata.gz: 971b99a920437e6cc25838a9298eb463baf078893210601853119ae0e4b2dc87f1909b73381ba5bd3674a94430e7082ef368c34cc7f51d62f506e2ca0da0ed4f
+  data.tar.gz: 39084d4d813b4ed1671db4b521de175de4e17196fe6a96eb08427cdaa9db9ada6fd9d8c701e723a282a552802b64576bf829a1318d8cf7fb1fbf3e1a4aed4772

data/ext/gdal-ruby/gdal/extconf.rb

@@ -21,5 +21,10 @@ $CXXFLAGS = CONFIG["CXXFLAGS"] unless defined?($CXXFLAGS)
 $CFLAGS << ' -Wno-format-security'
 $CXXFLAGS << ' -Wno-format-security'
 
+if !(`gdal-config --version`.strip =~ /^1/)
+  $CFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
+  $CXXFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
+end
+
 create_makefile 'gdal-ruby/gdal'
 

data/ext/gdal-ruby/gdal/gdal.cpp

@@ -8,8 +8,9 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
-#define SWIGRUBY
+#include "cpl_port.h"
 
+#define SWIGRUBY
 
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
@@ -1863,7 +1864,7 @@ using namespace std;
 #include "cpl_http.h"
 
 #include "gdal.h"
-#include "gdal_priv.h"
+/* #include "gdal_priv.h" */
 #include "gdal_alg.h"
 #include "gdalwarper.h"
 

data/ext/gdal-ruby/gdalconst/gdalconst.c

@@ -8,6 +8,8 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#include "cpl_port.h"
+
 #define SWIGRUBY
 
 /* -----------------------------------------------------------------------------

data/ext/gdal-ruby/ogr/extconf.rb

@@ -21,4 +21,9 @@ $CXXFLAGS = CONFIG["CXXFLAGS"] unless defined?($CXXFLAGS)
 $CFLAGS << ' -Wno-format-security'
 $CXXFLAGS << ' -Wno-format-security'
 
+if !(`gdal-config --version`.strip =~ /^1/)
+  $CFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
+  $CXXFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
+end
+
 create_makefile('gdal-ruby/ogr')

data/ext/gdal-ruby/ogr/ogr.cpp

@@ -8,8 +8,9 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
-#define SWIGRUBY
+#include "cpl_port.h"
 
+#define SWIGRUBY
 
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
@@ -1856,8 +1857,9 @@ typedef char retStringAndCPLFree;
 #include <iostream>
 using namespace std;
 
+#define CPL_SUPRESS_CPLUSPLUS
 #include "ogr_api.h"
-#include "ogr_p.h"
+/* #include "ogr_p.h" */
 #include "ogr_core.h"
 #include "cpl_port.h"
 #include "cpl_string.h"
@@ -3218,8 +3220,9 @@ OGRDriverShadow* GetDriver(int driver_number) {
   char **GeneralCmdLineProcessor( char **papszArgv, int nOptions = 0 ) {
     int nResArgCount;
 
-    nResArgCount = 
-      OGRGeneralCmdLineProcessor( CSLCount(papszArgv), &papszArgv, nOptions ); 
+    nResArgCount = 0;
+      /* TODO(zhm) REMOVED because this is not part of the C API in 2.x */
+      /* OGRGeneralCmdLineProcessor( CSLCount(papszArgv), &papszArgv, nOptions ); */ 
 
     if( nResArgCount <= 0 )
         return NULL;

data/ext/gdal-ruby/osr/extconf.rb

@@ -21,4 +21,9 @@ $CXXFLAGS = CONFIG["CXXFLAGS"] unless defined?($CXXFLAGS)
 $CFLAGS << ' -Wno-format-security'
 $CXXFLAGS << ' -Wno-format-security'
 
+if !(`gdal-config --version`.strip =~ /^1/)
+  $CFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
+  $CXXFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
+end
+
 create_makefile('gdal-ruby/osr')

data/ext/gdal-ruby/osr/osr.cpp

@@ -8,8 +8,9 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
-#define SWIGRUBY
+#include "cpl_port.h"
 
+#define SWIGRUBY
 
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
@@ -2473,7 +2474,8 @@ SWIGINTERN OGRErr OSRSpatialReferenceShadow_ImportFromMICoordSys(OSRSpatialRefer
     return OSRImportFromMICoordSys( self, pszCoordSys );
   }
 SWIGINTERN OGRErr OSRSpatialReferenceShadow_ImportFromOzi(OSRSpatialReferenceShadow *self,char const *datum,char const *proj,char const *projParms){
-    return OSRImportFromOzi( self, datum, proj, projParms );
+    return 0; // TODO(zhm) Removed becaues this function's signature has changed between GDAL 1.x and 2.x. Not worth figuring it out since it's a very exotic function.
+    /* return OSRImportFromOzi( self, datum, proj, projParms ); */
   }
 SWIGINTERN OGRErr OSRSpatialReferenceShadow_ExportToWkt(OSRSpatialReferenceShadow *self,char **argout){
     return OSRExportToWkt( self, argout );

data/lib/gdal-ruby/version.rb

@@ -1,5 +1,5 @@
 module Gdal
   module Ruby
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gdal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Zac McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: GDAL/OGR bindings for ruby. Currently contains native extensions for GDAL