From 1bba69b108ebb75802f7a823581cca3757ffbcf6 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Fri, 18 Mar 2022 22:56:06 +0100
Subject: [PATCH] [CI] update vcpkg to latest hash

notable changes: * proj => v9
[CI] fix sqlite dep

[vcpkg] update hash

update vcpkg cache
---
 .github/workflows/build_test.yml | 12 ++++++------
 .github/workflows/macos.yml      |  4 ++--
 .github/workflows/ubuntu.yml     |  4 ++--
 .github/workflows/windows.yml    |  2 +-
 CMakePresets.json                |  6 +++---
 vcpkg.json                       |  9 +++++++--
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index f4e5685a4..5ad346ff0 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -13,7 +13,7 @@ jobs:
     name: Windows memory mapped
     uses: mapnik/mapnik/.github/workflows/windows.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -24,7 +24,7 @@ jobs:
     name: Windows file based
     uses: mapnik/mapnik/.github/workflows/windows.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -35,7 +35,7 @@ jobs:
     name: Linux memory mapped
     uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -46,7 +46,7 @@ jobs:
     name: Linux file based
     uses: mapnik/mapnik/.github/workflows/ubuntu.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
@@ -57,7 +57,7 @@ jobs:
     name: MacOS memory mapped
     uses: mapnik/mapnik/.github/workflows/macos.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'ON'
@@ -68,7 +68,7 @@ jobs:
     name: MacOS file based
     uses: mapnik/mapnik/.github/workflows/macos.yml@master
     with:
-      VCPKG_SHA: 2e34a79a814551424d9b1a981b3b110e0a8fbdfd
+      VCPKG_SHA: 01d6f6ff1e5332b926099f0c23bda996940ad4e8
       NUGET_REGISTRY: https://nuget.pkg.github.com/mapnik/index.json
       NUGET_USERNAME: mapnik
       USE_MEMORY_MAPPED_FILE: 'OFF'
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a9dbd5fb1..a2a3d959f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -101,7 +101,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
         run: ./mapnik-test-visual -j $(sysctl -n hw.logicalcpu) --output-dir ./visual-test-result
 
       - name: Pack visual test results
@@ -111,7 +111,7 @@ jobs:
       - name: Run Benchmark
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data
         run: ./run_benchmarks
 
       - name: Coverage
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 6f17ccdfb..8fb246bf1 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -117,7 +117,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
         run: ./mapnik-test-visual -j $(nproc) --output-dir ./visual-test-result
 
       - name: Pack visual test results
@@ -127,7 +127,7 @@ jobs:
       - name: Run Benchmarks
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data
         run: ./run_benchmarks
 
       - name: Coverage
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 20a63565c..44f1ef6bb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -104,7 +104,7 @@ jobs:
         continue-on-error: true
         working-directory: build/${{ env.preset }}/out
         env:
-          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj4
+          PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj/data
         run: OpenCppCoverage --modules *libmapnik* --modules mapnik*.exe  --modules *.input --sources ${{ github.workspace }} --export_type binary --input_coverage=${{ github.workspace }}/ctest.cov --cover_children -- .\mapnik-test-visual.exe -j (Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors --output-dir ./visual-test-result
 
       - name: Pack visual test results
diff --git a/CMakePresets.json b/CMakePresets.json
index 46720854c..0b21f4631 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -194,7 +194,7 @@
                 "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj4"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj/data"
             }
         },
         {
@@ -209,7 +209,7 @@
                 "CMAKE_CXX_FLAGS": "--coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj4"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj/data"
             }
         },
         {
@@ -225,7 +225,7 @@
                 "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj4"
+                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj/data"
             }
         }
     ],
diff --git a/vcpkg.json b/vcpkg.json
index e3553d412..1bc58e8c3 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -60,9 +60,14 @@
     "mapbox-geometry",
     "mapbox-polylabel",
     "mapbox-variant",
-    "proj4",
+    "proj",
     "protozero",
-    "sqlite3",
+    {
+      "name": "sqlite3",
+      "features": [
+        "rtree"
+      ]
+    },
     "tiff",
     "zlib"
   ]