Skip to content

Commit 5ba00bb

Browse files
szekerestszekerest
committed
Update dependencies
1 parent 1b8a6c8 commit 5ba00bb

8 files changed

+78
-23
lines changed

‎Makefile

+58-4
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,16 @@ CMAKE_BUILDDIR = vc16x64
398398
CMAKE_GENERATOR = "Visual Studio 16 2019" -A Win32
399399
CMAKE_BUILDDIR = vc16
400400
!ENDIF
401+
!ELSEIF "$(_NMAKE_VER)" == "14.29.30157.0"
402+
MSVC_VER = 1928
403+
MESON_BACKEND = vs2019
404+
!IFDEF WIN64
405+
CMAKE_GENERATOR = "Visual Studio 16 2019" -A x64
406+
CMAKE_BUILDDIR = vc16x64
407+
!ELSE
408+
CMAKE_GENERATOR = "Visual Studio 16 2019" -A Win32
409+
CMAKE_BUILDDIR = vc16
410+
!ENDIF
401411
!ELSEIF "$(_NMAKE_VER)" == "14.30.30709.0"
402412
MSVC_VER = 1930
403413
MESON_BACKEND = vs2022
@@ -468,6 +478,26 @@ CMAKE_BUILDDIR = vc17x64
468478
CMAKE_GENERATOR = "Visual Studio 17 2022" -A Win32
469479
CMAKE_BUILDDIR = vc17
470480
!ENDIF
481+
!ELSEIF "$(_NMAKE_VER)" == "14.42.34433.0"
482+
MSVC_VER = 1930
483+
MESON_BACKEND = vs2022
484+
!IFDEF WIN64
485+
CMAKE_GENERATOR = "Visual Studio 17 2022" -A x64
486+
CMAKE_BUILDDIR = vc17x64
487+
!ELSE
488+
CMAKE_GENERATOR = "Visual Studio 17 2022" -A Win32
489+
CMAKE_BUILDDIR = vc17
490+
!ENDIF
491+
!ELSEIF "$(_NMAKE_VER)" == "14.42.34435.0"
492+
MSVC_VER = 1930
493+
MESON_BACKEND = vs2022
494+
!IFDEF WIN64
495+
CMAKE_GENERATOR = "Visual Studio 17 2022" -A x64
496+
CMAKE_BUILDDIR = vc17x64
497+
!ELSE
498+
CMAKE_GENERATOR = "Visual Studio 17 2022" -A Win32
499+
CMAKE_BUILDDIR = vc17
500+
!ENDIF
471501
!ELSE
472502
!ERROR This compiler version $(_NMAKE_VER) is not supported or must be enumerated in the makefile
473503
!ENDIF
@@ -1553,35 +1583,41 @@ $(MSVCRT_DLL):
15531583
xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC143.CRT\vcruntime140*.dll" $(OUTPUT_DIR)\bin
15541584
xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC143.CRT\msvcp140*.dll" $(OUTPUT_DIR)\bin
15551585
if exist "%VCToolsRedistDir%x64\Microsoft.VC143.CRT\concrt140.dll" xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC143.CRT\concrt140.dll" $(OUTPUT_DIR)\bin
1586+
if exist "%VCToolsRedistDir%MergeModules\Microsoft_VC143_CRT_x64.msm" xcopy /Y "%VCToolsRedistDir%MergeModules\Microsoft_VC143_CRT_x64.msm" $(BASE_DIR)
15561587
if not exist $(MSVCRT_DLL) echo msvcr140-x64 > $(MSVCRT_DLL)
15571588
!ELSE
15581589
xcopy /Y "%VCToolsRedistDir%x86\Microsoft.VC143.CRT\vcruntime140*.dll" $(OUTPUT_DIR)\bin
15591590
xcopy /Y "%VCToolsRedistDir%x86\Microsoft.VC143.CRT\msvcp140*.dll" $(OUTPUT_DIR)\bin
15601591
if exist "%VCToolsRedistDir%x86\Microsoft.VC143.CRT\concrt140.dll" xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC143.CRT\concrt140.dll" $(OUTPUT_DIR)\bin
1592+
if exist "%VCToolsRedistDir%MergeModules\Microsoft_VC143_CRT_x86.msm" xcopy /Y "%VCToolsRedistDir%MergeModules\Microsoft_VC143_CRT_x86.msm" $(BASE_DIR)
15611593
if not exist $(MSVCRT_DLL) echo msvcr140-x86 > $(MSVCRT_DLL)
15621594
!ENDIF
15631595
!ELSEIF $(MSVC_VER) >= 1922
15641596
!IFDEF WIN64
15651597
xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC142.CRT\vcruntime140*.dll" $(OUTPUT_DIR)\bin
15661598
xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC142.CRT\msvcp140*.dll" $(OUTPUT_DIR)\bin
15671599
if exist "%VCToolsRedistDir%x64\Microsoft.VC142.CRT\concrt140.dll" xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC142.CRT\concrt140.dll" $(OUTPUT_DIR)\bin
1600+
if exist "%VCToolsRedistDir%MergeModules\Microsoft_VC142_CRT_x64.msm" xcopy /Y "%VCToolsRedistDir%MergeModules\Microsoft_VC142_CRT_x64.msm" $(BASE_DIR)
15681601
if not exist $(MSVCRT_DLL) echo msvcr140-x64 > $(MSVCRT_DLL)
15691602
!ELSE
15701603
xcopy /Y "%VCToolsRedistDir%x86\Microsoft.VC142.CRT\vcruntime140*.dll" $(OUTPUT_DIR)\bin
15711604
xcopy /Y "%VCToolsRedistDir%x86\Microsoft.VC142.CRT\msvcp140*.dll" $(OUTPUT_DIR)\bin
15721605
if exist "%VCToolsRedistDir%x86\Microsoft.VC142.CRT\concrt140.dll" xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC142.CRT\concrt140.dll" $(OUTPUT_DIR)\bin
1606+
if exist "%VCToolsRedistDir%MergeModules\Microsoft_VC142_CRT_x86.msm" xcopy /Y "%VCToolsRedistDir%MergeModules\Microsoft_VC142_CRT_x86.msm" $(BASE_DIR)
15731607
if not exist $(MSVCRT_DLL) echo msvcr140-x86 > $(MSVCRT_DLL)
15741608
!ENDIF
15751609
!ELSEIF $(MSVC_VER) >= 1911
15761610
!IFDEF WIN64
15771611
xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\vcruntime140.dll" $(OUTPUT_DIR)\bin
15781612
xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\msvcp140.dll" $(OUTPUT_DIR)\bin
15791613
if exist "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\concrt140.dll" xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\concrt140.dll" $(OUTPUT_DIR)\bin
1614+
if exist "%VCToolsRedistDir%MergeModules\Microsoft_VC141_CRT_x64.msm" xcopy /Y "%VCToolsRedistDir%MergeModules\Microsoft_VC141_CRT_x64.msm" $(BASE_DIR)
15801615
if not exist $(MSVCRT_DLL) echo msvcr140-x64 > $(MSVCRT_DLL)
15811616
!ELSE
15821617
xcopy /Y "%VCToolsRedistDir%x86\Microsoft.VC141.CRT\vcruntime140.dll" $(OUTPUT_DIR)\bin
15831618
xcopy /Y "%VCToolsRedistDir%x86\Microsoft.VC141.CRT\msvcp140.dll" $(OUTPUT_DIR)\bin
15841619
if exist "%VCToolsRedistDir%x86\Microsoft.VC141.CRT\concrt140.dll" xcopy /Y "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\concrt140.dll" $(OUTPUT_DIR)\bin
1620+
if exist "%VCToolsRedistDir%MergeModules\Microsoft_VC141_CRT_x86.msm" xcopy /Y "%VCToolsRedistDir%MergeModules\Microsoft_VC141_CRT_x86.msm" $(BASE_DIR)
15851621
if not exist $(MSVCRT_DLL) echo msvcr140-x86 > $(MSVCRT_DLL)
15861622
!ENDIF
15871623
!ELSEIF $(MSVC_VER) == 1900
@@ -2377,7 +2413,22 @@ $(SWIG_INSTALL): $(CURL_EXE) $(CURL_CA_BUNDLE)
23772413
echo >$(OUTPUT_DIR)\build\swigwin-$(SWIG_VER).install
23782414
cd $(BASE_DIR)
23792415

2380-
$(FREEXL_LIB): $(LIBICONV_LIB) $(MSVCRT_DLL)
2416+
$(MINIZIP_LIB): $(ZLIB_LIB) $(MSVCRT_DLL)
2417+
!IFDEF MINIZIP_ENABLED
2418+
cd $(ZLIB_DIR)\contrib\minizip
2419+
if not exist $(BASE_DIR)\$(ZLIB_DIR)\contrib\minizip\Makefile.vc xcopy /Y $(BASE_DIR)\support\minizip\Makefile.vc $(BASE_DIR)\$(ZLIB_DIR)\contrib\minizip
2420+
!IFNDEF NO_CLEAN
2421+
nmake /f makefile.vc clean
2422+
!ENDIF
2423+
!IFNDEF NO_BUILD
2424+
nmake /f makefile.vc install "INSTALLDIR=$(OUTPUT_DIR)"
2425+
!ENDIF
2426+
cd $(BASE_DIR)
2427+
!ELSE
2428+
@echo $(MINIZIP_LIB) is outdated, but the build was suppressed! Remove this file to force rebuild.
2429+
!ENDIF
2430+
2431+
$(FREEXL_LIB): $(LIBICONV_LIB) $(LIBEXPAT_LIB) $(ZLIB_LIB) $(MINIZIP_LIB) $(MSVCRT_DLL)
23812432
!IFDEF FREEXL_ENABLED
23822433
SET PATH=$(OUTPUT_DIR)\bin;$(PATH)
23832434
SET CURL_CA_BUNDLE=$(CURL_CA_BUNDLE)
@@ -2389,7 +2440,7 @@ $(FREEXL_LIB): $(LIBICONV_LIB) $(MSVCRT_DLL)
23892440
nmake /f makefile.vc clean
23902441
!ENDIF
23912442
!IFNDEF NO_BUILD
2392-
echo INSTDIR=$(OUTPUT_DIR) >nmake.opt
2443+
echo INSTDIR=$(BASE_DIR)\$(FREEXL_DIR)\install >nmake.opt
23932444
echo OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT /DYY_NO_UNISTD_H /I$(OUTPUT_DIR)\include >>nmake.opt
23942445
powershell -Command "(gc makefile.vc) -replace 'C:\\OSGeo4w\\lib', '$$(LIBDIR)' | Out-File -encoding ASCII makefile.vc"
23952446
powershell -Command "(gc makefile.vc) -replace 'libminizip.lib', 'minizip.lib' | Out-File -encoding ASCII makefile.vc"
@@ -2398,6 +2449,9 @@ $(FREEXL_LIB): $(LIBICONV_LIB) $(MSVCRT_DLL)
23982449
cd ..
23992450
nmake /f makefile.vc install "LIBDIR=$(OUTPUT_DIR)\lib"
24002451
!ENDIF
2452+
xcopy /Y $(BASE_DIR)\$(FREEXL_DIR)\install\include\*.h $(OUTPUT_DIR)\include
2453+
xcopy /Y $(BASE_DIR)\$(FREEXL_DIR)\install\bin\*.dll $(OUTPUT_DIR)\bin
2454+
xcopy /Y $(BASE_DIR)\$(FREEXL_DIR)\install\lib\*.lib $(OUTPUT_DIR)\lib
24012455
cd $(BASE_DIR)
24022456
!ELSE
24032457
@echo $(FREEXL_LIB) is outdated, but the build was suppressed! Remove this file to force rebuild.
@@ -4347,9 +4401,9 @@ $(MAPMANAGER_INSTALLER) : $(MAPSERVER_LIB)
43474401

43484402
default: $(DEFAULT_TARGETS)
43494403

4350-
test: $(LIBWEBP_LIB)
4404+
test: $(PROJ9_LIB)
43514405

4352-
test2: $(SPATIALITE_LIB)
4406+
test2: $(LIBTIFF_LIB)
43534407

43544408
update-ms:
43554409
set PATH=$(OUTPUT_DIR)\bin;$(PATH)

‎Microsoft_VC142_CRT_x64.msm

-528 KB
Binary file not shown.

‎Microsoft_VC142_CRT_x86.msm

-520 KB
Binary file not shown.

‎Microsoft_VC143_CRT_x64.msm

1.2 MB
Binary file not shown.

‎Microsoft_VC143_CRT_x86.msm

80 KB
Binary file not shown.

‎config.opt

+12-9
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ ZLIB_BRANCH = v1.3.1
8585
ZLIB_SRC = https://github.com/madler/zlib.git
8686

8787
OPENSSL_DIR = $(SRC_DIR)\openssl
88-
OPENSSL_BRANCH = openssl-3.3.0
88+
OPENSSL_BRANCH = openssl-3.4.0
8989
OPENSSL_SRC = https://github.com/openssl/openssl.git
9090

9191
CURL_DIR = $(SRC_DIR)\curl
92-
CURL_BRANCH = curl-8_7_1
92+
CURL_BRANCH = curl-8_11_0
9393
CURL_SRC = https://github.com/curl/curl.git
9494

9595
LIBPNG_DIR = $(SRC_DIR)\libpng
@@ -109,16 +109,16 @@ HARFBUZZ_BRANCH = 3.0.0
109109
HARFBUZZ_SRC = https://github.com/harfbuzz/harfbuzz.git
110110

111111
GEOS_DIR = $(SRC_DIR)\geos
112-
GEOS_BRANCH = 3.10.2
112+
GEOS_BRANCH = 3.10.6
113113
GEOS_SRC = https://git.osgeo.org/gitea/geos/geos.git
114114

115115
FRIBIDI_DIR = $(SRC_DIR)\fribidi
116116
FRIBIDI_BRANCH = v1.0.10
117117
FRIBIDI_SRC = https://github.com/fribidi/fribidi.git
118118

119119
LIBICONV_DIR = $(SRC_DIR)\libiconv
120-
LIBICONV_VER = libiconv-1.16
121-
LIBICONV_SRC = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
120+
LIBICONV_VER = libiconv-1.17
121+
LIBICONV_SRC = https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz
122122

123123
PGSQL_DIR = $(SRC_DIR)\postgres
124124
PGSQL_BRANCH = REL_14_0
@@ -131,15 +131,15 @@ PROJ6_BRANCH = 6.3.2
131131
PROJ7_DIR = $(SRC_DIR)\proj7
132132
PROJ7_BRANCH = 7.2.1
133133
PROJ9_DIR = $(SRC_DIR)\proj9
134-
PROJ9_BRANCH = 9.3.0
134+
PROJ9_BRANCH = 9.5.0
135135
PROJ_SRC = https://github.com/OSGeo/PROJ.git
136136

137137
PROJ_DATA_DIR = $(SRC_DIR)\proj-data
138138
PROJ_DATA_BRANCH = 1.12.0
139139
PROJ_DATA_SRC = https://github.com/OSGeo/PROJ-data.git
140140

141141
SQLITE_DIR = $(SRC_DIR)\sqlite
142-
SQLITE_VER = 3.37.2
142+
SQLITE_VER = 3.47.1
143143
SQLITE_SRC = https://www.sqlite.org/src/zip/sqlite.zip?r=release
144144

145145
SPATIALITE_DIR = $(SRC_DIR)\spatialite
@@ -261,7 +261,7 @@ LIBSVGCAIRO_VER=libsvg-cairo-0.5.0
261261
LIBSVGCAIRO_SRC = https://sourceforge.net/projects/svg2swf/files/libsvg-cairo/0.5/libsvg-cairo-0.5.0.src.tar.gz/download
262262

263263
LIBTIFF_DIR = $(SRC_DIR)\libtiff
264-
LIBTIFF_BRANCH = v4.6.0
264+
LIBTIFF_BRANCH = v4.7.0
265265
LIBTIFF_SRC = https://gitlab.com/libtiff/libtiff.git
266266

267267
LIBGEOTIFF_DIR = $(SRC_DIR)\libgeotiff
@@ -305,7 +305,7 @@ NETCDF_BRANCH = v4.8.1
305305
NETCDF_SRC =https://github.com/Unidata/netcdf-c.git
306306

307307
OGDI_DIR = $(SRC_DIR)\ogdi
308-
OGDI_BRANCH = ogdi_4_1_0
308+
OGDI_BRANCH = ogdi_4_1_1
309309
OGDI_SRC = https://github.com/libogdi/ogdi.git
310310

311311
FITS_DIR = $(SRC_DIR)\fits
@@ -332,3 +332,6 @@ BUILD_OUTDATED_TARGETS = YES
332332
# Customizations
333333
PLATFORMSDK_VERSION = 10.0.17763.0
334334

335+
# Dependency build
336+
ENABLE_DEPENDENCIES = 1
337+

‎nuget/GDAL.Native.nuspec

+2-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<file src="..\release-1928-x64\bin\ogdi.dll" target="build\gdal\x64" />
4040
<file src="..\release-1928-x64\bin\openjp2.dll" target="build\gdal\x64" />
4141
<file src="..\release-1928-x64\bin\pcre.dll" target="build\gdal\x64" />
42-
<file src="..\release-1928-x64\bin\proj_9_1.dll" target="build\gdal\x64" />
43-
<file src="..\release-1928-x64\bin\proj_9_3.dll" target="build\gdal\x64" />
42+
<file src="..\release-1928-x64\bin\proj_9.dll" target="build\gdal\x64" />
4443
<file src="..\release-1928-x64\bin\remote.dll" target="build\gdal\x64" />
4544
<file src="..\release-1928-x64\bin\rpf.dll" target="build\gdal\x64" />
4645
<file src="..\release-1928-x64\bin\skeleton.dll" target="build\gdal\x64" />
@@ -78,8 +77,7 @@
7877
<file src="..\release-1928\bin\ogdi.dll" target="build\gdal\x86" />
7978
<file src="..\release-1928\bin\openjp2.dll" target="build\gdal\x86" />
8079
<file src="..\release-1928\bin\pcre.dll" target="build\gdal\x86" />
81-
<file src="..\release-1928\bin\proj_9_1.dll" target="build\gdal\x86" />
82-
<file src="..\release-1928\bin\proj_9_3.dll" target="build\gdal\x86" />
80+
<file src="..\release-1928\bin\proj_9.dll" target="build\gdal\x86" />
8381
<file src="..\release-1928\bin\remote.dll" target="build\gdal\x86" />
8482
<file src="..\release-1928\bin\rpf.dll" target="build\gdal\x86" />
8583
<file src="..\release-1928\bin\skeleton.dll" target="build\gdal\x86" />

‎setversions.bat

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
set ms_version=8-2
2-
set ms_rel=0
2+
set ms_rel=2
33

44
set gdal_major=3
5-
set gdal_minor=9
6-
set gdal_stable_tag=309
7-
set gdal_dev_tag=309
8-
set gdal_rel=1
5+
set gdal_minor=10
6+
set gdal_stable_tag=310
7+
set gdal_dev_tag=310
8+
set gdal_rel=0
99

1010
set gdal_version=%gdal_major%-%gdal_minor%
1111
set gdal-release-ver=%gdal_major%.%gdal_minor%.%gdal_rel%
1212

1313
set mapcache_major=1
1414
set mapcache_minor=14
15-
set mapcache_rel=0
15+
set mapcache_rel=1

0 commit comments

Comments
 (0)