[mapnik] update port (#22635)

* update mapnik

* version

* remove port-version

* versions
This commit is contained in:
Mathis Logemann 2022-01-20 23:29:45 +01:00 committed by GitHub
parent 54907ae3ba
commit 45ddaeea30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 21 deletions

View File

@ -4,11 +4,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mapnik/mapnik
REF 14f913d6ab3b0903dd36a1cb2d22f7d5493b8bb8
SHA512 f90762594d46946ddc512bb19b21c4d6a2f1ce81b7500a326ad512fae3a3f77e49ef3eb727ff8f98a31596e4132528212e0fa146e2eee0a9965a16551cfd0386
REF cf5541d180496628b8717306ef1f3fa87b89a886
SHA512 e82c3fd3da14ae37ebe04623ce03e8558326842aabd00fd8945a1db1dfff54b386a5e941996945981011d90cabbc3efbd2bffd49f55a34e1711940098629f70f
HEAD_REF master
PATCHES
proj-find-fix.patch # Quiet search with version range somehow fails for proj8+
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47bbaa1..43f384d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -304,7 +304,7 @@ if(USE_WEBP)
if(USE_PROJ)
#https://proj.org/development/cmake.html
- mapnik_find_package(PROJ ${PROJ_MIN_VERSION} QUIET)
+ mapnik_find_package(PROJ REQUIRED)
# currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config
if(NOT PROJ_FOUND)
message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...")

View File

@ -1,7 +1,6 @@
{
"name": "mapnik",
"version-date": "2021-11-15",
"port-version": 1,
"version-date": "2021-12-14",
"description": "Mapnik is an open source toolkit for developing mapping applications.",
"homepage": "https://github.com/mapnik/mapnik",
"supports": "!(static & windows)",

View File

@ -4297,8 +4297,8 @@
"port-version": 0
},
"mapnik": {
"baseline": "2021-11-15",
"port-version": 1
"baseline": "2021-12-14",
"port-version": 0
},
"marble": {
"baseline": "19.08.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e067081de907e0344717281f8d689421621d1798",
"version-date": "2021-12-14",
"port-version": 0
},
{
"git-tree": "3f8eb08ffc7a02dd08de30c0851587d9537fc72e",
"version-date": "2021-11-15",