[proj] Update to 9.5.0 (#41566)

microsoft · Oct 18, 2024 · c0bca51 · c0bca51
1 parent 922d7c8
commit c0bca51
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 46 deletions.
diff --git a/ports/proj/fix-gcc-version-less-8.patch b/ports/proj/fix-gcc-version-less-8.patch
diff --git a/ports/proj/fix-win-output-name.patch b/ports/proj/fix-win-output-name.patch
diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake
@@ -1,21 +1,13 @@
-vcpkg_download_distfile(PATCH_ADD_OPTION_EMBED_PROJ_DATA_PATH
-    URLS https://github.com/OSGeo/PROJ/commit/bddac146b2aa9db78cd491153aaad260eb307b11.patch?full_index=1
-    SHA512 06511fe82f85498813e1b99a419359e9877689f7c763db392a66ae0202027ee12f9a4015a5bb9c13a357d0ba22d002b021e5c0dc9c31d33293c48fc71e766a69
-    FILENAME OSGeo-PROJ-bddac146b2aa9db78cd491153aaad260eb307b11.patch
-)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/PROJ
     REF "${VERSION}"
-    SHA512 4b3ceb9e3b2213b0bb2fc839f4dd70e08ee53323465c7bb473131907e4b66c836623da115c7413dfd8bafd0a992fa173003063e2233ab577139ab8462655b6cc
+    SHA512 8fb672e664951f849926743b8a44b5052ed83fd51c6fdcc0cd5aa7fe4bf428ec0a8627d90cc6690c21e51f593f5e7c29c933a02a9fc57625baa122d4c96d5727
     HEAD_REF master
     PATCHES
-        fix-win-output-name.patch
         fix-proj4-targets-cmake.patch
         remove_toolset_restriction.patch
-        fix-gcc-version-less-8.patch
-        "${PATCH_ADD_OPTION_EMBED_PROJ_DATA_PATH}"
+        sqlite.diff
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/proj/sqlite.diff b/ports/proj/sqlite.diff
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c9de0f..d43fe91 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -214,12 +214,12 @@ if(DEFINED SQLITE3_LIBRARY)
+   set(SQLite3_LIBRARY ${SQLITE3_LIBRARY})
+ endif()
+
+-find_package(SQLite3 REQUIRED)
++find_package(unofficial-sqlite3 CONFIG REQUIRED)
++add_library(SQLite::SQLite3 ALIAS unofficial::sqlite3::sqlite3)
+
+ # Would build and run with older versions, but with horrible performance
+ # See https://github.com/OSGeo/PROJ/issues/1718
+ if(SQLite3_VERSION VERSION_LESS "3.11")
+-  message(SEND_ERROR "SQLite3 >= 3.11 required!")
+ endif()
+
+ ################################################################################
+diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
+index 0ca48aa..ab4e931 100644
+--- a/cmake/project-config.cmake.in
++++ b/cmake/project-config.cmake.in
+@@ -27,7 +27,7 @@ if("@CURL_ENABLED@")
+ endif()
+ cmake_policy(POP)
+
+-find_dependency(SQLite3)
++find_dependency(unofficial-sqlite3)
+
+ if(DEFINED PROJ_CONFIG_FIND_TIFF_DEP)
+     find_dependency(TIFF)
diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "proj",
-  "version": "9.4.1",
-  "port-version": 2,
+  "version": "9.5.0",
   "description": "PROJ library for cartographic projections",
   "homepage": "https://proj.org/",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7145,8 +7145,8 @@
       "port-version": 0
     },
     "proj": {
-      "baseline": "9.4.1",
-      "port-version": 2
+      "baseline": "9.5.0",
+      "port-version": 0
     },
     "projectm-eval": {
       "baseline": "1.0.0",

diff --git a/versions/p-/proj.json b/versions/p-/proj.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ad030b3ef1738638e18ee8a23d4aeb2afbf8cc8",
+      "version": "9.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "50f38dc99103f1c718d8fe295888d1f675548e87",
       "version": "9.4.1",