[GRASS-SVN] r73839 - in grass/branches/releasebranch_7_4: lib/raster mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-12-25 12:34:25 -0800 (Tue, 25 Dec 2018)
New Revision: 73839

Modified:
   grass/branches/releasebranch_7_4/lib/raster/gdal.c
   grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh
Log:
wingrass: switch to GDAL 2.4.0 in OSGeo4W (g74: merge r73833 and r73837 from trunk), see #3716

Modified: grass/branches/releasebranch_7_4/lib/raster/gdal.c
===================================================================
--- grass/branches/releasebranch_7_4/lib/raster/gdal.c	2018-12-25 20:11:28 UTC (rev 73838)
+++ grass/branches/releasebranch_7_4/lib/raster/gdal.c	2018-12-25 20:34:25 UTC (rev 73839)
@@ -115,6 +115,7 @@
 	"libgdal1.7.0.so",
 # endif
 # ifdef _WIN32
+	"gdal204.dll",        
 	"gdal203.dll",        
 	"gdal202.dll",        
 	"gdal201.dll",

Modified: grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh	2018-12-25 20:11:28 UTC (rev 73838)
+++ grass/branches/releasebranch_7_4/mswindows/osgeo4w/package.sh	2018-12-25 20:34:25 UTC (rev 73839)
@@ -118,7 +118,7 @@
 [ -d mswindows/osgeo4w/lib ] || mkdir mswindows/osgeo4w/lib 
 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/gdal203.dll     mswindows/osgeo4w/lib/libgdal
+dll_to_a $OSGEO4W_ROOT_MSYS/bin/gdal204.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