From 6f1ff9ca169eea0046bf7eef067243e9d027176f Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 7 Jul 2021 10:55:06 +0200 Subject: [PATCH 01/35] add mapnik --- ports/mapnik/portfile.cmake | 113 +++++++++++++++++++ ports/mapnik/usage | 7 ++ ports/mapnik/use-proj4.patch | 21 ++++ ports/mapnik/vcpkg.json | 210 +++++++++++++++++++++++++++++++++++ 4 files changed, 351 insertions(+) create mode 100644 ports/mapnik/portfile.cmake create mode 100644 ports/mapnik/usage create mode 100644 ports/mapnik/use-proj4.patch create mode 100644 ports/mapnik/vcpkg.json diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake new file mode 100644 index 00000000000000..1d87c6e9853e1f --- /dev/null +++ b/ports/mapnik/portfile.cmake @@ -0,0 +1,113 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mathisloge/mapnik + REF 3397fff8eaf3f4a40bc478e64cfb7db6ad4c5474 + SHA512 7ffb698a30e26078b8cee37249680f0206636464016b85d2898345480cd046fe1a7eb78391a7033d12d26652026735a8a9ca91ce56044a3bba4c6e79062023b3 + HEAD_REF master + PATCHES + "use-proj4.patch" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + jpeg USE_JPEG + png USE_PNG + tiff USE_TIFF + webp USE_WEBP + libxml2 USE_LIBXML2 + cairo USE_CAIRO + proj USE_PROJ + "grid-renderer" USE_GRID_RENDERER + "svg-renderer" USE_SVG_RENDERER + "input-csv" USE_PLUGIN_INPUT_CSV + "input-gdal" USE_PLUGIN_INPUT_GDAL + "input-geobuf" USE_PLUGIN_INPUT_GEOBUF + "input-geojson" USE_PLUGIN_INPUT_GEOJSON + "input-ogr" USE_PLUGIN_INPUT_OGR + "input-pgraster" USE_PLUGIN_INPUT_PGRASTER + "input-postgis" USE_PLUGIN_INPUT_POSTGIS + "input-raster" USE_PLUGIN_INPUT_RASTER + "input-shape" USE_PLUGIN_INPUT_SHAPE + "input-sqlite" USE_PLUGIN_INPUT_SQLITE + "input-topojson" USE_PLUGIN_INPUT_TOPOJSON + viewer BUILD_DEMO_VIEWER + demo BUILD_DEMO_CPP + "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB + "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX + "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER + "utility-ogrindex" BUILD_UTILITY_OGRINDEX + "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE + "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX + "utility-svg2png" BUILD_UTILITY_SVG2PNG +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DCOPY_LIBRARIES_FOR_EXECUTABLES=OFF + -DCOPY_FONTS_AND_PLUGINS_FOR_EXECUTABLES=OFF + -DINSTALL_DEPENDENCIES=OFF + -DBUILD_SHARED_LIBS=ON + -DBUILD_TEST=OFF + -DBUILD_BENCHMARK=OFF + -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON + -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON + -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON + -DUSE_EXTERNAL_MAPBOX_VARIANT=ON + -DINSTALL_CMAKE_DIR=share/${PORT}/cmake + -DFONTS_INSTALL_DIR=share/${PORT}/fonts +) + +vcpkg_install_cmake() + +# copy plugins into tool path, if any plugin is installed +if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) + file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() +vcpkg_copy_pdbs() + +if("demo" IN_LIST FEATURES) + file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/demo) + vcpkg_copy_tools(TOOL_NAMES mapnik-demo AUTO_CLEAN) +endif() + +if("viewer" IN_LIST FEATURES) + # copy the ini file to reference the plugins correctly + file(COPY ${CURRENT_PACKAGES_DIR}/bin/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) +endif() + +if("utility-geometry-to-wkb" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES geometry_to_wkb AUTO_CLEAN) +endif() + +if("utility-mapnik-index" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-index AUTO_CLEAN) +endif() +if("utility-mapnik-render" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-render AUTO_CLEAN) +endif() +if("utility-ogrindex" IN_LIST FEATURES) + # build is currently not supported + # vcpkg_copy_tools(TOOL_NAMES ogrindex AUTO_CLEAN) +endif() +if("utility-pgsql2sqlite" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES pgsql2sqlite AUTO_CLEAN) +endif() +if("utility-shapeindex" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES shapeindex AUTO_CLEAN) +endif() +if("utility-svg2png" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/mapnik/usage b/ports/mapnik/usage new file mode 100644 index 00000000000000..e89d8a415b3e8a --- /dev/null +++ b/ports/mapnik/usage @@ -0,0 +1,7 @@ +The package mapnik provides CMake targets: + + find_package(mapnik CONFIG REQUIRED) + target_link_libraries(main PRIVATE mapnik::core mapnik::mapnik mapnik::json mapnik::wkt) + +If any plugins were installed, the variable ${MAPNIK_PLUGINS_DIR} contains the plugin directory +Fonts are available with the variable ${MAPNIK_FONTS_DIR} diff --git a/ports/mapnik/use-proj4.patch b/ports/mapnik/use-proj4.patch new file mode 100644 index 00000000000000..4c4df7522bb2b0 --- /dev/null +++ b/ports/mapnik/use-proj4.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 981eb75..279df6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,12 +231,12 @@ endif() + + if(USE_PROJ) + #https://proj.org/development/cmake.html +- mapnik_find_package(PROJ REQUIRED) +- math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) ++ mapnik_find_package(PROJ4 REQUIRED) ++ math(EXPR MAPNIK_PROJ_VERSION "${PROJ4_VERSION_MAJOR}*10000 + ${PROJ4_VERSION_MINOR}*100 + ${PROJ4_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) + message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}") + list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION}) +- list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) +- list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) ++ list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ4_LIBRARIES}) ++ # list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ4_INCLUDE_DIRS}) # this adds some non existent directory when building with vcpgk -> commented out + endif() + + if(USE_GRID_RENDERER) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json new file mode 100644 index 00000000000000..665843395b0873 --- /dev/null +++ b/ports/mapnik/vcpkg.json @@ -0,0 +1,210 @@ +{ + "name": "mapnik", + "version-semver": "4.0.0", + "description": "Mapnik is an open source toolkit for developing mapping applications.", + "homepage": "https://github.com/mapnik/mapnik", + "supports": "!(static & windows)", + "dependencies": [ + "boost-assign", + "boost-bimap", + "boost-filesystem", + "boost-geometry", + "boost-gil", + "boost-interprocess", + { + "name": "boost-locale", + "features": [ + "icu" + ] + }, + "boost-msm", + "boost-property-tree", + { + "name": "boost-regex", + "features": [ + "icu" + ] + }, + "boost-spirit", + "boost-system", + { + "name": "freetype", + "features": [ + "bzip2", + "png" + ] + }, + { + "name": "harfbuzz", + "features": [ + "icu" + ] + }, + "icu", + "mapbox-geometry", + "mapbox-polylabel", + "mapbox-variant", + "protozero", + "zlib" + ], + "features": { + "cairo": { + "description": "Cairo renderer", + "dependencies": [ + "cairo", + "cairomm" + ] + }, + "demo": { + "description": "Make demo application" + }, + "grid-renderer": { + "description": "Grid renderer" + }, + "input-csv": { + "description": "CSV input plugin" + }, + "input-gdal": { + "description": "GDAL input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-geobuf": { + "description": "GEOBUF input plugin", + "dependencies": [ + "protozero" + ] + }, + "input-geojson": { + "description": "GEOJSON input plugin" + }, + "input-ogr": { + "description": "OGR input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-pgraster": { + "description": "PGRASTER input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-postgis": { + "description": "POSTGIS input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-raster": { + "description": "RASTER input plugin" + }, + "input-shape": { + "description": "SHAPE input plugin" + }, + "input-sqlite": { + "description": "SQLITE input plugin", + "dependencies": [ + "sqlite3" + ] + }, + "input-topojson": { + "description": "TOPOJSON input plugin" + }, + "jpeg": { + "description": "add jpeg support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libxml2": { + "description": "use libxml2 instead of rapidxml", + "dependencies": [ + "libxml2" + ] + }, + "png": { + "description": "add png support", + "dependencies": [ + "libpng" + ] + }, + "proj": { + "description": "PROJ Functionalities", + "dependencies": [ + { + "name": "proj4", + "features": [ + "database" + ] + } + ] + }, + "svg-renderer": { + "description": "SVG renderer" + }, + "tiff": { + "description": "add tiff support", + "dependencies": [ + "tiff" + ] + }, + "utility-geometry-to-wkb": { + "description": "utility application geometry-to-wkb", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-mapnik-index": { + "description": "utility application mapnik-index", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-mapnik-render": { + "description": "utility application mapnik-render", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-ogrindex": { + "description": "utility application ogrindex" + }, + "utility-pgsql2sqlite": { + "description": "utility application pgsql2sqlite", + "dependencies": [ + "boost-program-options", + "libodb-pgsql", + "libpq", + "sqlite3" + ] + }, + "utility-shapeindex": { + "description": "utility application shapeindex", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-svg2png": { + "description": "utility application svg2png", + "dependencies": [ + "boost-program-options" + ] + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, + "webp": { + "description": "add webp support", + "dependencies": [ + "libwebp" + ] + } + } +} From 5e7bb2a3873475366f6455003c49b318f02a4a7f Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 7 Jul 2021 10:55:13 +0200 Subject: [PATCH 02/35] version --- versions/baseline.json | 4 ++++ versions/m-/mapnik.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/m-/mapnik.json diff --git a/versions/baseline.json b/versions/baseline.json index a4360fc3e0a0a4..34216c316f0801 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3916,6 +3916,10 @@ "baseline": "0.5.0", "port-version": 0 }, + "mapnik": { + "baseline": "4.0.0", + "port-version": 0 + }, "marble": { "baseline": "19.08.2", "port-version": 2 diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json new file mode 100644 index 00000000000000..2a91c0af0b361b --- /dev/null +++ b/versions/m-/mapnik.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "89db548e3580b40d408048956eb178fab6981c10", + "version-semver": "4.0.0", + "port-version": 0 + } + ] +} From 1348c600868cca5cea41866e153c9ea7d147f2b9 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 7 Jul 2021 21:09:04 +0200 Subject: [PATCH 03/35] update to latest ref --- ports/mapnik/portfile.cmake | 4 ++-- ports/mapnik/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 1d87c6e9853e1f..24f653922434b0 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 3397fff8eaf3f4a40bc478e64cfb7db6ad4c5474 - SHA512 7ffb698a30e26078b8cee37249680f0206636464016b85d2898345480cd046fe1a7eb78391a7033d12d26652026735a8a9ca91ce56044a3bba4c6e79062023b3 + REF 59f9974baa8693d8b99c4f479b413e7a41c46ef9 + SHA512 5e75f47c15cf61b35a7a5b0b9d86fe9b4db8bcc495b9a5ee03476169038b9560f23bf3045400fc6fa7349c3a8cdb42d8a204402d12d9f4cf4ddb57adcdd872ac HEAD_REF master PATCHES "use-proj4.patch" diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 665843395b0873..58e6489415018a 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -117,7 +117,7 @@ "jpeg": { "description": "add jpeg support", "dependencies": [ - "libjpeg-turbo" + "openjpeg" ] }, "libxml2": { From cd89f3a61371b81aa4c0d46c4fa457e3e0f1a49b Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 7 Jul 2021 21:09:24 +0200 Subject: [PATCH 04/35] overwrite version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 2a91c0af0b361b..f613860a7a30ef 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "89db548e3580b40d408048956eb178fab6981c10", + "git-tree": "1199fe5bf74a87c4430434f69f84a71bf83297a1", "version-semver": "4.0.0", "port-version": 0 } From 6dbca1e21cc39986597720ae45276faff0ae8aed Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 7 Jul 2021 21:12:09 +0200 Subject: [PATCH 05/35] latest ref --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 24f653922434b0..92d293b2c878a7 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 59f9974baa8693d8b99c4f479b413e7a41c46ef9 + REF 01159d07217364405e558e8b0585dcdb92e9107c SHA512 5e75f47c15cf61b35a7a5b0b9d86fe9b4db8bcc495b9a5ee03476169038b9560f23bf3045400fc6fa7349c3a8cdb42d8a204402d12d9f4cf4ddb57adcdd872ac HEAD_REF master PATCHES From b32be8a2455847be39931f2a7607869c615403fa Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 7 Jul 2021 21:12:25 +0200 Subject: [PATCH 06/35] fix hash --- ports/mapnik/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 92d293b2c878a7..3b266c6cf50e8a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik REF 01159d07217364405e558e8b0585dcdb92e9107c - SHA512 5e75f47c15cf61b35a7a5b0b9d86fe9b4db8bcc495b9a5ee03476169038b9560f23bf3045400fc6fa7349c3a8cdb42d8a204402d12d9f4cf4ddb57adcdd872ac + SHA512 901b3c369482991e63c4d1262738329a3bcb66d9d592bd9a5f287c07ae18f87336f14ff7de30ba1608188630c5ac7e0e5c04f34a83b8778fc7dd5eee19b56993 HEAD_REF master PATCHES "use-proj4.patch" From b7d64d9814751f63ac9542754caeb0bb345dcfc8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 7 Jul 2021 21:12:33 +0200 Subject: [PATCH 07/35] verison --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index f613860a7a30ef..3f4631bbe3d077 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1199fe5bf74a87c4430434f69f84a71bf83297a1", + "git-tree": "b6f138a68abcf6cbea2710d7ed0fc07d62fd9edb", "version-semver": "4.0.0", "port-version": 0 } From 042dd27fd45ece35f1bddf61e5963ef8104f4cb0 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 22 Jul 2021 21:08:04 +0200 Subject: [PATCH 08/35] update to latest upstream --- ports/mapnik/portfile.cmake | 4 ++-- ports/mapnik/use-proj4.patch | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 3b266c6cf50e8a..12949d835ebecf 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 01159d07217364405e558e8b0585dcdb92e9107c - SHA512 901b3c369482991e63c4d1262738329a3bcb66d9d592bd9a5f287c07ae18f87336f14ff7de30ba1608188630c5ac7e0e5c04f34a83b8778fc7dd5eee19b56993 + REF 03b1f18c89dfa77befd63344682ad3cd7a36efe1 + SHA512 325ef7927960a5b5e7dfe9908bebfd01dc0406150fa5baf823e42ea17e5b388ade0f49ebf562c6dbf2cd021281baae4d29d0235cb35e851366a1b589bce2c6e2 HEAD_REF master PATCHES "use-proj4.patch" diff --git a/ports/mapnik/use-proj4.patch b/ports/mapnik/use-proj4.patch index 4c4df7522bb2b0..6905679d092209 100644 --- a/ports/mapnik/use-proj4.patch +++ b/ports/mapnik/use-proj4.patch @@ -1,21 +1,36 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 981eb75..279df6a 100644 +index 54dda37..e82a817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -231,12 +231,12 @@ endif() +@@ -254,21 +254,21 @@ endif() if(USE_PROJ) #https://proj.org/development/cmake.html -- mapnik_find_package(PROJ REQUIRED) +- mapnik_find_package(PROJ QUIET) ++ mapnik_find_package(PROJ4 QUIET) + # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config +- if(NOT PROJ_FOUND) ++ if(NOT PROJ4_FOUND) + message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...") +- pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj) +- string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}") +- set(PROJ_VERSION_MAJOR "${CMAKE_MATCH_1}") +- set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}") +- set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}") ++ pkg_check_modules(PROJ4 REQUIRED IMPORTED_TARGET proj) ++ string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ4_VERSION}") ++ set(PROJ4_VERSION_MAJOR "${CMAKE_MATCH_1}") ++ set(PROJ4_VERSION_MINOR "${CMAKE_MATCH_2}") ++ set(PROJ4_VERSION_PATCH "${CMAKE_MATCH_3}") + endif() - math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) -+ mapnik_find_package(PROJ4 REQUIRED) + math(EXPR MAPNIK_PROJ_VERSION "${PROJ4_VERSION_MAJOR}*10000 + ${PROJ4_VERSION_MINOR}*100 + ${PROJ4_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}") list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION}) - list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) - list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) + list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ4_LIBRARIES}) -+ # list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ4_INCLUDE_DIRS}) # this adds some non existent directory when building with vcpgk -> commented out ++ # list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) # this adds some non existent directory when building with vcpgk -> commented out endif() if(USE_GRID_RENDERER) From 478f1b303ada4da02bc229c19c11f454b5e969b1 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 22 Jul 2021 21:08:53 +0200 Subject: [PATCH 09/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 3f4631bbe3d077..c0899c7bde9079 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b6f138a68abcf6cbea2710d7ed0fc07d62fd9edb", + "git-tree": "2de99d16dfb95818339463e555af67c225a313f1", "version-semver": "4.0.0", "port-version": 0 } From 4d15711e56bcb310090de4f8f1c2908bd98161d6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 22 Jul 2021 21:11:38 +0200 Subject: [PATCH 10/35] false jpeg lib --- ports/mapnik/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 58e6489415018a..665843395b0873 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -117,7 +117,7 @@ "jpeg": { "description": "add jpeg support", "dependencies": [ - "openjpeg" + "libjpeg-turbo" ] }, "libxml2": { From 033b3bb01fa41ede81cefb5ec35e3d8eee1f8100 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 22 Jul 2021 21:11:46 +0200 Subject: [PATCH 11/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index c0899c7bde9079..f50418389576b1 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2de99d16dfb95818339463e555af67c225a313f1", + "git-tree": "9276688393d0f8104d3ed8705668d5092c10d0b9", "version-semver": "4.0.0", "port-version": 0 } From e46b87a8315bcb6dbff445af2938dab2d582aee8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 23 Jul 2021 18:43:39 +0200 Subject: [PATCH 12/35] update to latest ref --- ports/mapnik/portfile.cmake | 10 +++++----- ports/mapnik/vcpkg.json | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 12949d835ebecf..6b7f0dc6184ba8 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik - REF 03b1f18c89dfa77befd63344682ad3cd7a36efe1 - SHA512 325ef7927960a5b5e7dfe9908bebfd01dc0406150fa5baf823e42ea17e5b388ade0f49ebf562c6dbf2cd021281baae4d29d0235cb35e851366a1b589bce2c6e2 + REF a8d6bdcac1be7f8b7fb2ee584f3115ca875d8c96 + SHA512 08e1bfacd1bf5416b4f75cbeb0f63e327af1d14c64f67c431682494deb92fb53c111f9c1c36c61a745b3a6c5d615f7ccbe59279f1d1bc94574db92f87260152a HEAD_REF master PATCHES "use-proj4.patch" @@ -42,7 +42,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "utility-svg2png" BUILD_UTILITY_SVG2PNG ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS @@ -61,7 +61,7 @@ vcpkg_configure_cmake( -DFONTS_INSTALL_DIR=share/${PORT}/fonts ) -vcpkg_install_cmake() +vcpkg_cmake_install() # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) @@ -104,7 +104,7 @@ if("utility-svg2png" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 665843395b0873..82b9ab532bc773 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -45,6 +45,14 @@ "mapbox-polylabel", "mapbox-variant", "protozero", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { From 5d67a865d507f821f6e0783ac381fbf474c02454 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 23 Jul 2021 18:43:55 +0200 Subject: [PATCH 13/35] verssion --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index f50418389576b1..03c8aeabc6276f 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9276688393d0f8104d3ed8705668d5092c10d0b9", + "git-tree": "e34bd8de8075ae11817e2ed7e578dd6566f39305", "version-semver": "4.0.0", "port-version": 0 } From 8051b7b5a252cf0caf57e8959257b591be2e2a64 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 11 Aug 2021 01:13:57 +0200 Subject: [PATCH 14/35] proj not needed --- ports/mapnik/use-proj4.patch | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/ports/mapnik/use-proj4.patch b/ports/mapnik/use-proj4.patch index 6905679d092209..97e8e68a05d136 100644 --- a/ports/mapnik/use-proj4.patch +++ b/ports/mapnik/use-proj4.patch @@ -6,25 +6,17 @@ index 54dda37..e82a817 100644 if(USE_PROJ) #https://proj.org/development/cmake.html -- mapnik_find_package(PROJ QUIET) -+ mapnik_find_package(PROJ4 QUIET) + mapnik_find_package(PROJ QUIET) # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config -- if(NOT PROJ_FOUND) -+ if(NOT PROJ4_FOUND) + if(NOT PROJ_FOUND) message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...") -- pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj) -- string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}") -- set(PROJ_VERSION_MAJOR "${CMAKE_MATCH_1}") -- set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}") -- set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}") -+ pkg_check_modules(PROJ4 REQUIRED IMPORTED_TARGET proj) -+ string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ4_VERSION}") -+ set(PROJ4_VERSION_MAJOR "${CMAKE_MATCH_1}") -+ set(PROJ4_VERSION_MINOR "${CMAKE_MATCH_2}") -+ set(PROJ4_VERSION_PATCH "${CMAKE_MATCH_3}") + pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj) + string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}") + set(PROJ_VERSION_MAJOR "${CMAKE_MATCH_1}") + set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}") + set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}") endif() -- math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) -+ math(EXPR MAPNIK_PROJ_VERSION "${PROJ4_VERSION_MAJOR}*10000 + ${PROJ4_VERSION_MINOR}*100 + ${PROJ4_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) + math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}") list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION}) - list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) From 1bc6705ec899b9f65e520d6053a30ff473611b01 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 11 Aug 2021 01:14:38 +0200 Subject: [PATCH 15/35] versioon --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 03c8aeabc6276f..2ba100cd0a1106 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e34bd8de8075ae11817e2ed7e578dd6566f39305", + "git-tree": "cbc59a9c4823c824d0b8655dd4d21f3e548f54b4", "version-semver": "4.0.0", "port-version": 0 } From 7b068d4f1319da310bca2eeada1b547532dfe646 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 13 Aug 2021 18:46:18 +0200 Subject: [PATCH 16/35] fix proj patch --- ports/mapnik/portfile.cmake | 2 +- ports/mapnik/{use-proj4.patch => use-proj.patch} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename ports/mapnik/{use-proj4.patch => use-proj.patch} (94%) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 6b7f0dc6184ba8..513c4e546687ee 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( SHA512 08e1bfacd1bf5416b4f75cbeb0f63e327af1d14c64f67c431682494deb92fb53c111f9c1c36c61a745b3a6c5d615f7ccbe59279f1d1bc94574db92f87260152a HEAD_REF master PATCHES - "use-proj4.patch" + "use-proj.patch" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/use-proj4.patch b/ports/mapnik/use-proj.patch similarity index 94% rename from ports/mapnik/use-proj4.patch rename to ports/mapnik/use-proj.patch index 97e8e68a05d136..35e588e37fc494 100644 --- a/ports/mapnik/use-proj4.patch +++ b/ports/mapnik/use-proj.patch @@ -21,7 +21,7 @@ index 54dda37..e82a817 100644 list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION}) - list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) - list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) -+ list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ4_LIBRARIES}) ++ list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) + # list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) # this adds some non existent directory when building with vcpgk -> commented out endif() From e70c947ce257f3dad9988ac65216711923c83fba Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 13 Aug 2021 18:46:27 +0200 Subject: [PATCH 17/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 2ba100cd0a1106..3ac80a52b61ae1 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cbc59a9c4823c824d0b8655dd4d21f3e548f54b4", + "git-tree": "5395f644de05a60ea66e1146be2162190644af5e", "version-semver": "4.0.0", "port-version": 0 } From b715393a20472a0f2259759aaadad36110227360 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 24 Aug 2021 20:23:10 +0200 Subject: [PATCH 18/35] actually the linkage is already checked in `supports`. Apply latest policies. Added default features --- ports/mapnik/portfile.cmake | 83 ++++++++++++++++++------------------- ports/mapnik/vcpkg.json | 9 ++++ 2 files changed, 49 insertions(+), 43 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 513c4e546687ee..4da077464346ff 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mathisloge/mapnik @@ -11,72 +10,70 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - jpeg USE_JPEG - png USE_PNG - tiff USE_TIFF - webp USE_WEBP - libxml2 USE_LIBXML2 - cairo USE_CAIRO - proj USE_PROJ - "grid-renderer" USE_GRID_RENDERER - "svg-renderer" USE_SVG_RENDERER - "input-csv" USE_PLUGIN_INPUT_CSV - "input-gdal" USE_PLUGIN_INPUT_GDAL - "input-geobuf" USE_PLUGIN_INPUT_GEOBUF - "input-geojson" USE_PLUGIN_INPUT_GEOJSON - "input-ogr" USE_PLUGIN_INPUT_OGR - "input-pgraster" USE_PLUGIN_INPUT_PGRASTER - "input-postgis" USE_PLUGIN_INPUT_POSTGIS - "input-raster" USE_PLUGIN_INPUT_RASTER - "input-shape" USE_PLUGIN_INPUT_SHAPE - "input-sqlite" USE_PLUGIN_INPUT_SQLITE - "input-topojson" USE_PLUGIN_INPUT_TOPOJSON - viewer BUILD_DEMO_VIEWER - demo BUILD_DEMO_CPP - "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB - "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX - "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER - "utility-ogrindex" BUILD_UTILITY_OGRINDEX - "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE - "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX - "utility-svg2png" BUILD_UTILITY_SVG2PNG + "jpeg" USE_JPEG + "png" USE_PNG + "tiff" USE_TIFF + "webp" USE_WEBP + "libxml2" USE_LIBXML2 + "cairo" USE_CAIRO + "proj" USE_PROJ + "grid-renderer" USE_GRID_RENDERER + "svg-renderer" USE_SVG_RENDERER + "input-csv" USE_PLUGIN_INPUT_CSV + "input-gdal" USE_PLUGIN_INPUT_GDAL + "input-geobuf" USE_PLUGIN_INPUT_GEOBUF + "input-geojson" USE_PLUGIN_INPUT_GEOJSON + "input-ogr" USE_PLUGIN_INPUT_OGR + "input-pgraster" USE_PLUGIN_INPUT_PGRASTER + "input-postgis" USE_PLUGIN_INPUT_POSTGIS + "input-raster" USE_PLUGIN_INPUT_RASTER + "input-shape" USE_PLUGIN_INPUT_SHAPE + "input-sqlite" USE_PLUGIN_INPUT_SQLITE + "input-topojson" USE_PLUGIN_INPUT_TOPOJSON + "viewer" BUILD_DEMO_VIEWER + "demo" BUILD_DEMO_CPP + "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB + "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX + "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER + "utility-ogrindex" BUILD_UTILITY_OGRINDEX + "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE + "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX + "utility-svg2png" BUILD_UTILITY_SVG2PNG ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DCOPY_LIBRARIES_FOR_EXECUTABLES=OFF -DCOPY_FONTS_AND_PLUGINS_FOR_EXECUTABLES=OFF -DINSTALL_DEPENDENCIES=OFF - -DBUILD_SHARED_LIBS=ON -DBUILD_TEST=OFF -DBUILD_BENCHMARK=OFF -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON - -DINSTALL_CMAKE_DIR=share/${PORT}/cmake - -DFONTS_INSTALL_DIR=share/${PORT}/fonts + -DINSTALL_CMAKE_DIR="share/${PORT}/cmake" + -DFONTS_INSTALL_DIR="share/${PORT}/fonts" ) vcpkg_cmake_install() # copy plugins into tool path, if any plugin is installed -if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin/plugins) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin/plugins") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/plugins" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() vcpkg_copy_pdbs() if("demo" IN_LIST FEATURES) - file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/demo) + file(COPY "${SOURCE_PATH}/demo/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/demo") vcpkg_copy_tools(TOOL_NAMES mapnik-demo AUTO_CLEAN) endif() if("viewer" IN_LIST FEATURES) # copy the ini file to reference the plugins correctly - file(COPY ${CURRENT_PACKAGES_DIR}/bin/viewer.ini DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(COPY "${CURRENT_PACKAGES_DIR}/bin/viewer.ini" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) endif() @@ -104,10 +101,10 @@ if("utility-svg2png" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) endif() -vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH "share/${PORT}/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME fonts_copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/fonts/unifont_license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME fonts_copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 82b9ab532bc773..4ea7d30454171f 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -55,6 +55,15 @@ }, "zlib" ], + "default-features": [ + "grid-renderer", + "jpeg", + "png", + "proj", + "svg-renderer", + "tiff", + "webp" + ], "features": { "cairo": { "description": "Cairo renderer", From 46eb68517bffbdd86a3fc949a725df4c6f35f95b Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 24 Aug 2021 20:23:53 +0200 Subject: [PATCH 19/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 3ac80a52b61ae1..577f12658323e1 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5395f644de05a60ea66e1146be2162190644af5e", + "git-tree": "73551c86121c2d91d0b4cdf2d53c3c10319a8e9a", "version-semver": "4.0.0", "port-version": 0 } From 7adda92cab4a6da14eba2ff14d13e11ff94f3d56 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 30 Aug 2021 17:59:25 +0200 Subject: [PATCH 20/35] update to original ref --- ports/mapnik/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 4da077464346ff..8a04a9a7218b65 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO mathisloge/mapnik - REF a8d6bdcac1be7f8b7fb2ee584f3115ca875d8c96 - SHA512 08e1bfacd1bf5416b4f75cbeb0f63e327af1d14c64f67c431682494deb92fb53c111f9c1c36c61a745b3a6c5d615f7ccbe59279f1d1bc94574db92f87260152a + REPO mapnik/mapnik + REF 69911ad9eac59e1b495ea495b298ec854dde26b1 + SHA512 3f4ab9091ea689ea554bf1065c29066f2d10c34ea2689b06e7e29747661af762b73b843be51d2aa6b46a80afe6d738b780fb87cf440151a87b5bd191ce1a0870 HEAD_REF master PATCHES "use-proj.patch" From 9f7e0748099706ac12047d0dd1f237e499b6f464 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 30 Aug 2021 18:05:14 +0200 Subject: [PATCH 21/35] enable dynamic again --- ports/mapnik/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 8a04a9a7218b65..daecbb18a76a3c 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,3 +1,4 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik From 33540c1172e1532f8d92780ef78d54a4ecf27961 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 30 Aug 2021 18:05:47 +0200 Subject: [PATCH 22/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 577f12658323e1..453fdaffc631e4 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "73551c86121c2d91d0b4cdf2d53c3c10319a8e9a", + "git-tree": "12eef3d84f599485b0e8d6c302a6414aa1e88720", "version-semver": "4.0.0", "port-version": 0 } From 5a4f4fd881564a42f28041705f0159badf1b93de Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 13 Sep 2021 10:18:27 +0200 Subject: [PATCH 23/35] use date version --- ports/mapnik/portfile.cmake | 4 ++-- ports/mapnik/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index daecbb18a76a3c..abc5f4b9633eb7 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 69911ad9eac59e1b495ea495b298ec854dde26b1 - SHA512 3f4ab9091ea689ea554bf1065c29066f2d10c34ea2689b06e7e29747661af762b73b843be51d2aa6b46a80afe6d738b780fb87cf440151a87b5bd191ce1a0870 + REF 737e7a69c2679b33093e1ebf0b4c3fa34ae36878 + SHA512 ff57fdb27eff8a83519601a30428f6979b042e8029484da8a3605a75d58120eaaaf57dfb456cb19d9078cfbdca3bd1f8fc38cc31c61cde3cd037ef246853ca73 HEAD_REF master PATCHES "use-proj.patch" diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 4ea7d30454171f..d81574b4342ff2 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapnik", - "version-semver": "4.0.0", + "version-date": "2021-09-01", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", From 70a906cfe89324e3079c1d80d6e28873de0a9b9f Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 13 Sep 2021 10:18:49 +0200 Subject: [PATCH 24/35] update version --- versions/baseline.json | 2 +- versions/m-/mapnik.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2ed1c5c97506cc..5f73929dab5b71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4049,7 +4049,7 @@ "port-version": 0 }, "mapnik": { - "baseline": "4.0.0", + "baseline": "2021-09-01", "port-version": 0 }, "marble": { diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 453fdaffc631e4..53fb287ea8bb80 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0472c1b13ab2e352be5b7ebd0958b0d9a7b5bf69", + "version-date": "2021-09-01", + "port-version": 0 + }, { "git-tree": "12eef3d84f599485b0e8d6c302a6414aa1e88720", "version-semver": "4.0.0", From ee17d93fba63d7d1648921e94ccf4161b4dd83a8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 13 Sep 2021 10:20:02 +0200 Subject: [PATCH 25/35] do not add a second version --- versions/m-/mapnik.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 53fb287ea8bb80..3d63c77fe3952f 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -4,11 +4,6 @@ "git-tree": "0472c1b13ab2e352be5b7ebd0958b0d9a7b5bf69", "version-date": "2021-09-01", "port-version": 0 - }, - { - "git-tree": "12eef3d84f599485b0e8d6c302a6414aa1e88720", - "version-semver": "4.0.0", - "port-version": 0 } ] } From 3279b5461adaf85858e6173c8b22f00a76035db6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 13 Sep 2021 10:46:38 +0200 Subject: [PATCH 26/35] fix linux installing --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index abc5f4b9633eb7..8a8400e018ebab 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -55,8 +55,8 @@ vcpkg_cmake_configure( -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON - -DINSTALL_CMAKE_DIR="share/${PORT}/cmake" - -DFONTS_INSTALL_DIR="share/${PORT}/fonts" + -DINSTALL_CMAKE_DIR=share/${PORT}/cmake + -DFONTS_INSTALL_DIR=share/${PORT}/fonts ) vcpkg_cmake_install() From 99ca1062f6f2437a43030d1b4b187780e40fdbe2 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Mon, 13 Sep 2021 10:46:54 +0200 Subject: [PATCH 27/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 3d63c77fe3952f..eefa9b13ccd8ef 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0472c1b13ab2e352be5b7ebd0958b0d9a7b5bf69", + "git-tree": "69edea353a963b28d132acd380091fa2e349acbf", "version-date": "2021-09-01", "port-version": 0 } From 01785220da77a73b2510e469f44b461661c856d0 Mon Sep 17 00:00:00 2001 From: Mathis Date: Tue, 14 Sep 2021 08:46:03 +0200 Subject: [PATCH 28/35] Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 8a8400e018ebab..d82fd339c2ee58 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -6,40 +6,40 @@ vcpkg_from_github( SHA512 ff57fdb27eff8a83519601a30428f6979b042e8029484da8a3605a75d58120eaaaf57dfb456cb19d9078cfbdca3bd1f8fc38cc31c61cde3cd037ef246853ca73 HEAD_REF master PATCHES - "use-proj.patch" + use-proj.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "jpeg" USE_JPEG - "png" USE_PNG - "tiff" USE_TIFF - "webp" USE_WEBP - "libxml2" USE_LIBXML2 - "cairo" USE_CAIRO - "proj" USE_PROJ - "grid-renderer" USE_GRID_RENDERER - "svg-renderer" USE_SVG_RENDERER - "input-csv" USE_PLUGIN_INPUT_CSV - "input-gdal" USE_PLUGIN_INPUT_GDAL - "input-geobuf" USE_PLUGIN_INPUT_GEOBUF - "input-geojson" USE_PLUGIN_INPUT_GEOJSON - "input-ogr" USE_PLUGIN_INPUT_OGR - "input-pgraster" USE_PLUGIN_INPUT_PGRASTER - "input-postgis" USE_PLUGIN_INPUT_POSTGIS - "input-raster" USE_PLUGIN_INPUT_RASTER - "input-shape" USE_PLUGIN_INPUT_SHAPE - "input-sqlite" USE_PLUGIN_INPUT_SQLITE - "input-topojson" USE_PLUGIN_INPUT_TOPOJSON - "viewer" BUILD_DEMO_VIEWER - "demo" BUILD_DEMO_CPP - "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB - "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX - "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER - "utility-ogrindex" BUILD_UTILITY_OGRINDEX - "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE - "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX - "utility-svg2png" BUILD_UTILITY_SVG2PNG + FEATURES + "jpeg" USE_JPEG + "png" USE_PNG + "tiff" USE_TIFF + "webp" USE_WEBP + "libxml2" USE_LIBXML2 + "cairo" USE_CAIRO + "proj" USE_PROJ + "grid-renderer" USE_GRID_RENDERER + "svg-renderer" USE_SVG_RENDERER + "input-csv" USE_PLUGIN_INPUT_CSV + "input-gdal" USE_PLUGIN_INPUT_GDAL + "input-geobuf" USE_PLUGIN_INPUT_GEOBUF + "input-geojson" USE_PLUGIN_INPUT_GEOJSON + "input-ogr" USE_PLUGIN_INPUT_OGR + "input-pgraster" USE_PLUGIN_INPUT_PGRASTER + "input-postgis" USE_PLUGIN_INPUT_POSTGIS + "input-raster" USE_PLUGIN_INPUT_RASTER + "input-shape" USE_PLUGIN_INPUT_SHAPE + "input-sqlite" USE_PLUGIN_INPUT_SQLITE + "input-topojson" USE_PLUGIN_INPUT_TOPOJSON + "viewer" BUILD_DEMO_VIEWER + "demo" BUILD_DEMO_CPP + "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB + "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX + "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER + "utility-ogrindex" BUILD_UTILITY_OGRINDEX + "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE + "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX + "utility-svg2png" BUILD_UTILITY_SVG2PNG ) vcpkg_cmake_configure( @@ -102,7 +102,7 @@ if("utility-svg2png" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) endif() -vcpkg_cmake_config_fixup(CONFIG_PATH "share/${PORT}/cmake") +vcpkg_cmake_config_fixup(CONFIG_PATH share/mapnik/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From 727272ba8fcae97cb76518fb744fa35ff4568c92 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 14 Sep 2021 08:48:00 +0200 Subject: [PATCH 29/35] do not use port var --- ports/mapnik/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index d82fd339c2ee58..263f42c9bc5c21 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -55,8 +55,8 @@ vcpkg_cmake_configure( -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON - -DINSTALL_CMAKE_DIR=share/${PORT}/cmake - -DFONTS_INSTALL_DIR=share/${PORT}/fonts + -DINSTALL_CMAKE_DIR=share/mapnik/cmake + -DFONTS_INSTALL_DIR=share/mapnik/fonts ) vcpkg_cmake_install() From e468a9294bc6964807309e508b9cacd8b7303c48 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 14 Sep 2021 14:07:30 +0200 Subject: [PATCH 30/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index eefa9b13ccd8ef..7c9759e8a109f1 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "69edea353a963b28d132acd380091fa2e349acbf", + "git-tree": "df89c27f7a0231d1ec0ac357efb794841c2c993e", "version-date": "2021-09-01", "port-version": 0 } From 34ae59e8e7307386b3b999cd0ccc0e8f754fb140 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 15 Sep 2021 18:18:05 +0200 Subject: [PATCH 31/35] drop mapnik::core from general usage info. --- ports/mapnik/portfile.cmake | 4 ++-- ports/mapnik/usage | 4 +++- ports/mapnik/vcpkg.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 263f42c9bc5c21..4979b2a6523cb0 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 737e7a69c2679b33093e1ebf0b4c3fa34ae36878 - SHA512 ff57fdb27eff8a83519601a30428f6979b042e8029484da8a3605a75d58120eaaaf57dfb456cb19d9078cfbdca3bd1f8fc38cc31c61cde3cd037ef246853ca73 + REF 1ccbbf95b5e7bf254ab5b4dc21bdc373978c36a1 + SHA512 21b4fc6e64d9b53550a046c5c9bcc32524324d7df39816b74b23a7ce2a64c4eeb291ad1c1aa09a3d5d79158f889ba8b7182cd0bf3435c39d1f17f33e4ffdce05 HEAD_REF master PATCHES use-proj.patch diff --git a/ports/mapnik/usage b/ports/mapnik/usage index e89d8a415b3e8a..3bd0f4a014c75d 100644 --- a/ports/mapnik/usage +++ b/ports/mapnik/usage @@ -1,7 +1,9 @@ The package mapnik provides CMake targets: find_package(mapnik CONFIG REQUIRED) - target_link_libraries(main PRIVATE mapnik::core mapnik::mapnik mapnik::json mapnik::wkt) + target_link_libraries(main PRIVATE mapnik::mapnik mapnik::json mapnik::wkt) + +If you only need the compile definitions without any sources, use target mapnik::core. If any plugins were installed, the variable ${MAPNIK_PLUGINS_DIR} contains the plugin directory Fonts are available with the variable ${MAPNIK_FONTS_DIR} diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index d81574b4342ff2..c6aebcc527709d 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapnik", - "version-date": "2021-09-01", + "version-date": "2021-09-15", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", From 40c2b38244df4b900979bec8b3426694f9f68b86 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 15 Sep 2021 18:18:31 +0200 Subject: [PATCH 32/35] version --- versions/baseline.json | 2 +- versions/m-/mapnik.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2c3eaf7fb07cdb..a2872e9927fa1a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4061,7 +4061,7 @@ "port-version": 0 }, "mapnik": { - "baseline": "2021-09-01", + "baseline": "2021-09-15", "port-version": 0 }, "marble": { diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 7c9759e8a109f1..c08e3b3cf9789c 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04ff671bc9aecb9c6a1104b7c152e59ca0a3e4ef", + "version-date": "2021-09-15", + "port-version": 0 + }, { "git-tree": "df89c27f7a0231d1ec0ac357efb794841c2c993e", "version-date": "2021-09-01", From 025ae88369ee1cc761c740ebd85ae172108921af Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 15 Sep 2021 18:48:50 +0200 Subject: [PATCH 33/35] don't add a new version --- versions/m-/mapnik.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index c08e3b3cf9789c..1add2149d1f02b 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -4,11 +4,6 @@ "git-tree": "04ff671bc9aecb9c6a1104b7c152e59ca0a3e4ef", "version-date": "2021-09-15", "port-version": 0 - }, - { - "git-tree": "df89c27f7a0231d1ec0ac357efb794841c2c993e", - "version-date": "2021-09-01", - "port-version": 0 } ] } From f131f369856d242b021aade351a1e820a94d7c82 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 16 Sep 2021 08:55:21 +0200 Subject: [PATCH 34/35] add comment to trigger ci --- ports/mapnik/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 4979b2a6523cb0..bc19d4ab9641b7 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -1,3 +1,5 @@ +# test application for this port: https://github.com/mathisloge/mapnik-vcpkg-test + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From f193b62c70ac6fc5943a13b2f74f7f608fd0153b Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 16 Sep 2021 08:55:43 +0200 Subject: [PATCH 35/35] version --- versions/m-/mapnik.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 1add2149d1f02b..7924f1250b7be4 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "04ff671bc9aecb9c6a1104b7c152e59ca0a3e4ef", + "git-tree": "794329d32e3af221bb8751cf747f354d087fceab", "version-date": "2021-09-15", "port-version": 0 }