diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 45872faccc..7de7fc8055 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 1a5ddc6a53f54e1c2f36cfd9af0ec05abc48c14207afaa89f449f3c7395f724ff92a8a5936608703dcc8b862e1762b1c3840445f440ebf9437816362aceef931 + SHA512 65119bf83d8680cb1648dce8997a131a256856aed1ad16fdb60812c6a159e4e1352e8463cb5c6fcf831113df58d2f6f9b814e13119d593c9319abd7cd63048a6 HEAD_REF master PATCHES find-link-libraries.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 350d832786..433fceab41 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdal", - "version-semver": "3.8.1", + "version-semver": "3.8.2", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b29297fc54..66e4f29c9d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1292,6 +1292,15 @@ vcpkg-ci-freerdp:x64-windows-static-md=pass vcpkg-ci-freerdp:x64-windows-static=pass vcpkg-ci-freerdp:x64-windows=pass vcpkg-ci-freerdp:x86-windows=pass +vcpkg-ci-gdal:arm-neon-android=pass +vcpkg-ci-gdal:arm64-android=pass +vcpkg-ci-gdal:x64-android=pass +vcpkg-ci-gdal:x64-linux=pass +vcpkg-ci-gdal:x64-osx=pass +vcpkg-ci-gdal:x64-windows-static-md=pass +vcpkg-ci-gdal:x64-windows-static=pass +vcpkg-ci-gdal:x64-windows=pass +vcpkg-ci-gdal:x86-windows=pass vcpkg-ci-llvm:x64-linux=pass vcpkg-ci-llvm:x64-osx=pass vcpkg-ci-llvm:x64-windows-static-md=pass diff --git a/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake b/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake new file mode 100644 index 0000000000..065116c276 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json new file mode 100644 index 0000000000..b514803243 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "vcpkg-ci-gdal", + "version-date": "2023-12-21", + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "license": "MIT", + "dependencies": [ + { + "name": "gdal", + "features": [ + "freexl" + ] + }, + { + "name": "gdal", + "features": [ + "postgresql" + ], + "platform": "linux" + }, + { + "name": "gdal", + "features": [ + "cfitsio" + ], + "platform": "native" + }, + { + "name": "gdal", + "features": [ + "mysql-libmariadb" + ], + "platform": "windows & x86" + }, + { + "name": "gdal", + "features": [ + "aws-ec2-windows" + ], + "platform": "windows & !mingw" + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d2de4687c4..546640ff9a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2881,7 +2881,7 @@ "port-version": 0 }, "gdal": { - "baseline": "3.8.1", + "baseline": "3.8.2", "port-version": 0 }, "gdcm": { diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 1cf843c4b9..f3bf447ee2 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c455ae6529676c606b6a031fa62d2c87e72ec86", + "version-semver": "3.8.2", + "port-version": 0 + }, { "git-tree": "33a60f073f77b16b9364659fea34df2cff9ea3ae", "version-semver": "3.8.1",