From e462b37ee94a2086cf0d8df829ab8f95531f8a48 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 7 Jan 2025 22:03:01 +0100 Subject: [PATCH 1/3] [gdal] Update to 3.10.1 [skip actions] --- ports/gdal/portfile.cmake | 6 +++--- ports/gdal/vcpkg.json | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 6ff0dac44fa7ad..51d2bc27ec5cc0 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF "v${VERSION}" - SHA512 4e0431c9bb9b7c54508afdcaa936445eee8878aa47f404e2ff00c8ce786c1dd58247c2cee76cb0e0e26cef04419d7c6c4884f2d9078e9d292c4a1c720deae3ed + REF "v${VERSION}RC1" + SHA512 b4af1ba5c0069a258c4a42be42e4473bf7b6341d01255196765f976029af08ecdb08e572f3e18aad800267ce9420175f8eb66db3194ffb6c00c5a35664b4bffe HEAD_REF master PATCHES find-link-libraries.patch fix-gdal-target-interfaces.patch libkml.patch target-is-valid.patch - remove-machine-flag.patch + # remove-machine-flag.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 8b731cc28814a1..b98b323d496b84 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.10.0", - "port-version": 2, + "version-semver": "3.10.1", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, From 357e1dc3ff1405176ecb22dd7ecfb80dd10fc726 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 8 Jan 2025 18:52:42 +0100 Subject: [PATCH 2/3] RC2 [skip actions] --- ports/gdal/portfile.cmake | 5 ++--- ports/gdal/remove-machine-flag.patch | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 ports/gdal/remove-machine-flag.patch diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 51d2bc27ec5cc0..08d1bf7069b38b 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF "v${VERSION}RC1" - SHA512 b4af1ba5c0069a258c4a42be42e4473bf7b6341d01255196765f976029af08ecdb08e572f3e18aad800267ce9420175f8eb66db3194ffb6c00c5a35664b4bffe + REF "v${VERSION}RC2" + SHA512 0c72710c4b9c4bac028177439bcea4d4a62a4a424a5fd0a5f44b4bbf053245a6996b7a26eb02f4b833fb9a8b2d38c249db429dd194cb6eb8416164ab07c2fd36 HEAD_REF master PATCHES find-link-libraries.patch fix-gdal-target-interfaces.patch libkml.patch target-is-valid.patch - # remove-machine-flag.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") diff --git a/ports/gdal/remove-machine-flag.patch b/ports/gdal/remove-machine-flag.patch deleted file mode 100644 index f759421eb2b226..00000000000000 --- a/ports/gdal/remove-machine-flag.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gdal.cmake b/gdal.cmake -index 029eedd..412fc88 100644 ---- a/gdal.cmake -+++ b/gdal.cmake -@@ -409,7 +409,6 @@ if (MSVC) - target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE gcore/Version.rc) - source_group("Resource Files" FILES gcore/Version.rc) - if (CMAKE_CL_64) -- set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") - endif () - endif () - From 2a4de81851caf49cf65b481c5b31db10ef6cbd18 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 13 Jan 2025 22:48:59 +0100 Subject: [PATCH 3/3] Update to 3.10.1 --- ports/gdal/portfile.cmake | 4 ++-- versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 08d1bf7069b38b..aa308535c41fe2 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF "v${VERSION}RC2" - SHA512 0c72710c4b9c4bac028177439bcea4d4a62a4a424a5fd0a5f44b4bbf053245a6996b7a26eb02f4b833fb9a8b2d38c249db429dd194cb6eb8416164ab07c2fd36 + REF "v${VERSION}" + SHA512 2094f9373b13bb600f6c7fbe7fa9da947be98ea06f427940dd0add0930c8fb65f2693148614efcec9c2a103666664aa215445c754b8a20490bfb0e9f2c89db72 HEAD_REF master PATCHES find-link-libraries.patch diff --git a/versions/baseline.json b/versions/baseline.json index c4562173d89515..4fb0973c724185 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3037,8 +3037,8 @@ "port-version": 0 }, "gdal": { - "baseline": "3.10.0", - "port-version": 2 + "baseline": "3.10.1", + "port-version": 0 }, "gdcm": { "baseline": "3.0.24", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index a6f5d78860bce2..3ca6d51fa48911 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c61c198b18d4eae98f2d99949455f6e55383e9a", + "version-semver": "3.10.1", + "port-version": 0 + }, { "git-tree": "88a7fee530483435f48df0f4b74ec378fee3345a", "version-semver": "3.10.0",