[proj] Update to 9.5.0 (#41566)

This commit is contained in:
Kai Pastor 2024-10-19 00:04:54 +02:00 committed by GitHub
parent 922d7c8c81
commit c0bca5189f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 42 additions and 46 deletions

View File

@ -1,19 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36afe1156..14287744d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,13 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
set(PROJ_C_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
-Wmissing-prototypes
)
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
+ set(PROJ_CXX_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
+ -Wextra-semi
+ )
+ endif()
set(PROJ_CXX_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
-Weffc++
- -Wextra-semi
# -Wold-style-cast
-Woverloaded-virtual
-Wzero-as-null-pointer-constant

View File

@ -1,13 +0,0 @@
diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake
index 6f43edb5c..1ed89d597 100644
--- a/cmake/ProjUtilities.cmake
+++ b/cmake/ProjUtilities.cmake
@@ -51,7 +51,7 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME)
# On Windows, ABI version is specified using binary file name suffix.
# On Unix, suffix is empty and SOVERSION is used instead.
- if(WIN32)
+ if(0)
string(LENGTH "${${PROJECT_NAME}_ABI_VERSION}" abilen)
if(abilen GREATER 0)
set(SUFFIX "_${${PROJECT_NAME}_ABI_VERSION}")

View File

@ -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

32
ports/proj/sqlite.diff Normal file
View File

@ -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)

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5ad030b3ef1738638e18ee8a23d4aeb2afbf8cc8",
"version": "9.5.0",
"port-version": 0
},
{
"git-tree": "50f38dc99103f1c718d8fe295888d1f675548e87",
"version": "9.4.1",