[GRASS-SVN] r73575 - in grass/branches/releasebranch_7_6: lib/raster mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-10-19 04:33:43 -0700 (Fri, 19 Oct 2018)
New Revision: 73575

Modified:
   grass/branches/releasebranch_7_6/lib/raster/gdal.c
   grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh
Log:
wingrass: switch to PROJ 5.2 and GDAL 2.3 (G76: merge r73573:73574 from trunk)

Modified: grass/branches/releasebranch_7_6/lib/raster/gdal.c
===================================================================
--- grass/branches/releasebranch_7_6/lib/raster/gdal.c	2018-10-19 11:32:07 UTC (rev 73574)
+++ grass/branches/releasebranch_7_6/lib/raster/gdal.c	2018-10-19 11:33:43 UTC (rev 73575)
@@ -115,6 +115,7 @@
 	"libgdal1.7.0.so",
 # endif
 # ifdef _WIN32
+	"gdal203.dll",        
 	"gdal202.dll",        
 	"gdal201.dll",
 	"gdal200.dll",

Modified: grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh	2018-10-19 11:32:07 UTC (rev 73574)
+++ grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh	2018-10-19 11:33:43 UTC (rev 73575)
@@ -116,9 +116,9 @@
 
 log dll.to.a
 [ -d mswindows/osgeo4w/lib ] || mkdir mswindows/osgeo4w/lib 
-dll_to_a $OSGEO4W_ROOT_MSYS/bin/proj.dll        mswindows/osgeo4w/lib/libproj
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/proj_5_2.dll    mswindows/osgeo4w/lib/libproj
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/iconv.dll       mswindows/osgeo4w/lib/libiconv
-dll_to_a $OSGEO4W_ROOT_MSYS/bin/gdal202.dll     mswindows/osgeo4w/lib/libgdal
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/gdal203.dll     mswindows/osgeo4w/lib/libgdal
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/liblas_c.dll    mswindows/osgeo4w/lib/liblas_c
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/geos_c.dll      mswindows/osgeo4w/lib/libgeos_c
 dll_to_a $OSGEO4W_ROOT_MSYS/bin/libtiff.dll     mswindows/osgeo4w/lib/libtiff