proj: update to 9.4.1.

Closes: #49522 [via git-merge-pr]
This commit is contained in:
Arjan Mossel 2024-03-25 13:22:08 +01:00 committed by classabbyamp
parent 432d8af725
commit c64e750a99
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
2 changed files with 3 additions and 43 deletions

View file

@ -1,40 +0,0 @@
--- a/cmake/project-config.cmake.in
+++ b/cmake/project-config.cmake.in
@@ -13,37 +13,6 @@ endif()
include(CMakeFindDependencyMacro)
-# We cannot have a find_dependency() call between cmake_policy(PUSH)/cmake_policy(POP)
-# because find_dependency() issues a return() on failure, which results in
-# imbalanced push/pop
-# Cf https://gitlab.kitware.com/cmake/cmake/-/issues/17612
-cmake_policy(PUSH)
-cmake_policy(SET CMP0012 NEW)
-if("@ENABLE_TIFF@")
- set(PROJ_CONFIG_FIND_TIFF_DEP ON)
-endif()
-if("@CURL_ENABLED@")
- set(PROJ_CONFIG_FIND_CURL_DEP ON)
-endif()
-cmake_policy(POP)
-
-if(DEFINED PROJ_CONFIG_FIND_TIFF_DEP)
- find_dependency(TIFF)
-endif()
-
-if(DEFINED PROJ_CONFIG_FIND_CURL_DEP)
- # Chainload CURL usage requirements
- find_dependency(CURL)
- # Target CURL::libcurl only defined since CMake 3.12
- if(NOT TARGET CURL::libcurl)
- add_library(CURL::libcurl INTERFACE IMPORTED)
- set_target_properties(CURL::libcurl PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
- INTERFACE_LINK_LIBRARIES "${CURL_LIBRARIES}"
- )
- endif()
-endif()
-
function(set_variable_from_rel_or_absolute_path var root rel_or_abs_path)
if(IS_ABSOLUTE "${rel_or_abs_path}")
set(${var} "${rel_or_abs_path}" PARENT_SCOPE)

View file

@ -1,17 +1,17 @@
# Template file for 'proj'
pkgname=proj
version=9.3.1
version=9.4.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="python3"
makedepends="libcurl-devel sqlite-devel tiff-devel"
makedepends="libcurl-devel openssl-devel sqlite-devel tiff-devel"
short_desc="Cartographic Projections Library"
maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://proj.org"
distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
checksum=b0f919cb9e1f42f803a3e616c2b63a78e4d81ecfaed80978d570d3a5e29d10bc
checksum=ffe20170ee2b952207adf8a195e2141eab12cda181e49fdeb54425d98c7171d7
post_install() {
vlicense COPYING