Date: Wed, 8 Oct 2025 21:41:00 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d4b1dd743cb4 - main - graphics/mapnik: update to 4.1.3 Message-ID: <202510082141.598Lf0oY086367@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4b1dd743cb498cb16fbd4fdb311b2613ffd12a4 commit d4b1dd743cb498cb16fbd4fdb311b2613ffd12a4 Author: David Hummel <hummeltech@sherpaguru.com> AuthorDate: 2025-10-05 03:39:04 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2025-10-08 21:40:43 +0000 graphics/mapnik: update to 4.1.3 New tiles input plugin on i386 building has been fixed, re-enabling. Updated patch from dd0ccaf9dd47b0738b9ca84ced8265d8e837cbd4. Changelog: https://github.com/mapnik/mapnik/blob/v4.1.3/CHANGELOG.md Compare changes: https://github.com/mapnik/mapnik/compare/v4.1.0...v4.1.3 PR: 290006 Reported by: David Hummel <hummeltech@sherpaguru.com> (maintainer) --- graphics/mapnik/Makefile | 47 +++++++++------------- graphics/mapnik/distinfo | 18 ++++----- .../patch-plugins_input_tiles_pmtiles__source.hpp | 29 ++++++++----- graphics/mapnik/pkg-plist | 4 +- 4 files changed, 48 insertions(+), 50 deletions(-) diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index 0ccc49b31b01..63afe33996da 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -1,7 +1,6 @@ PORTNAME= mapnik DISTVERSIONPREFIX= v -DISTVERSION= 4.1.0 -PORTREVISION= 2 +DISTVERSION= 4.1.3 CATEGORIES= graphics geography MAINTAINER= hummeltech@sherpaguru.com @@ -21,14 +20,12 @@ LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ RUN_DEPENDS= dejavu>0:x11-fonts/dejavu USE_GITHUB= yes -GH_ACCOUNT= mapnik -GH_PROJECT= mapnik -GH_TUPLE= mapbox:geometry.hpp:c83a2ab:geometry_hpp/deps/mapbox/geometry \ - mapbox:polylabel:51f09d0:polylabel/deps/mapbox/polylabel \ +GH_TUPLE= catchorg:Catch2:v2.13.10:catch2/test/catch2 \ + mapbox:geometry.hpp:c83a2ab:geometry_hpp/deps/mapbox/geometry \ + mapbox:polylabel:0121820:polylabel/deps/mapbox/polylabel \ mapbox:variant:a2a4858:variant/deps/mapbox/variant \ mapnik:mapnik-vector-tile:5a0cfbb:mapnik_vector_tile/deps/mapbox/mapnik-vector-tile \ - catchorg:Catch2:v2.13.10:catch2/test/catch2 \ - mapnik:test-data:41c4cee:test_data/test/data + mapnik:test-data:5716a27:test_data/test/data USES= compiler:c++20-lang cmake:testing gnome pkgconfig USE_GNOME= libxml2 @@ -37,8 +34,8 @@ USE_LDCONFIG= yes CMAKE_ARGS= -DFONTS_INSTALL_DIR:PATH=share/fonts/dejavu CMAKE_ON= USE_EXTERNAL_MAPBOX_PROTOZERO -OPTIONS_DEFINE= CAIRO DOCS JPEG PNG PROJ TIFF WEBP -OPTIONS_DEFAULT= CAIRO JPEG PNG PROJ TIFF WEBP \ +OPTIONS_DEFINE= CAIRO DOCS JPEG PNG PROJ TIFF WEBP AVIF +OPTIONS_DEFAULT= CAIRO JPEG PNG PROJ TIFF WEBP AVIF \ GDAL OGR PGRASTER POSTGIS SQLITE3 \ TESTING \ GEOMETRY_TO_WKB MAPNIK_INDEX MAPNIK_RENDER PGSQL2SQLITE SHAPEINDEX SVG2PNG @@ -48,6 +45,8 @@ OPTIONS_GROUP_TESTS= BENCHMARK DEMO_CPP DEMO_VIEWER TESTING OPTIONS_GROUP_UTILS= GEOMETRY_TO_WKB MAPNIK_INDEX MAPNIK_RENDER OGRINDEX PGSQL2SQLITE SHAPEINDEX SVG2PNG OPTIONS_SUB= yes +AVIF_CMAKE_BOOL= USE_AVIF +AVIF_LIB_DEPENDS= libavif.so:graphics/libavif JPEG_CMAKE_BOOL= USE_JPEG JPEG_USES= jpeg PNG_CMAKE_BOOL= USE_PNG @@ -98,28 +97,18 @@ POSTGIS_USES= pgsql SQLITE3_CMAKE_BOOL= USE_PLUGIN_INPUT_SQLITE SQLITE3_USES= sqlite:3 -BENCHMARK_CMAKE_BOOL= BUILD_BENCHMARK -DEMO_CPP_CMAKE_BOOL= BUILD_DEMO_CPP +BENCHMARK_CMAKE_BOOL= BUILD_BENCHMARK +DEMO_CPP_CMAKE_BOOL= BUILD_DEMO_CPP DEMO_VIEWER_CMAKE_BOOL= BUILD_DEMO_VIEWER TESTING_CMAKE_BOOL= BUILD_TESTING -GEOMETRY_TO_WKB_CMAKE_BOOL= BUILD_UTILITY_GEOMETRY_TO_WKB -MAPNIK_INDEX_CMAKE_BOOL= BUILD_UTILITY_MAPNIK_INDEX -MAPNIK_RENDER_CMAKE_BOOL= BUILD_UTILITY_MAPNIK_RENDER -OGRINDEX_CMAKE_BOOL= BUILD_UTILITY_OGRINDEX -PGSQL2SQLITE_CMAKE_BOOL= BUILD_UTILITY_PGSQL2SQLITE -SHAPEINDEX_CMAKE_BOOL= BUILD_UTILITY_SHAPEINDEX -SVG2PNG_CMAKE_BOOL= BUILD_UTILITY_SVG2PNG - -# MB/PMTiles input plugin (added in 4.1.0) will not compile on i386 without a patch -.include <bsd.port.options.mk> - -.if ${ARCH} == i386 -CMAKE_OFF= USE_PLUGIN_INPUT_TILES -PLIST_SUB+= NOTI386="@comment " -.else -PLIST_SUB+= NOTI386="" -.endif +GEOMETRY_TO_WKB_CMAKE_BOOL= BUILD_UTILITY_GEOMETRY_TO_WKB +MAPNIK_INDEX_CMAKE_BOOL= BUILD_UTILITY_MAPNIK_INDEX +MAPNIK_RENDER_CMAKE_BOOL= BUILD_UTILITY_MAPNIK_RENDER +OGRINDEX_CMAKE_BOOL= BUILD_UTILITY_OGRINDEX +PGSQL2SQLITE_CMAKE_BOOL= BUILD_UTILITY_PGSQL2SQLITE +SHAPEINDEX_CMAKE_BOOL= BUILD_UTILITY_SHAPEINDEX +SVG2PNG_CMAKE_BOOL= BUILD_UTILITY_SVG2PNG pre-configure-SQLITE3-on: @if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \ diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo index 8b01693b4123..a6c57bffda1f 100644 --- a/graphics/mapnik/distinfo +++ b/graphics/mapnik/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1748882156 -SHA256 (mapnik-mapnik-v4.1.0_GH0.tar.gz) = 8c5cab13a2f9c9ac32bd4a574d920d5c0571611d48a2dd8c710540767559fc96 -SIZE (mapnik-mapnik-v4.1.0_GH0.tar.gz) = 13253474 +TIMESTAMP = 1759637867 +SHA256 (mapnik-mapnik-v4.1.3_GH0.tar.gz) = 04a39a878fb60204853adf79a9e5be803609c6eab180d6403d67fc8b4691fa9f +SIZE (mapnik-mapnik-v4.1.3_GH0.tar.gz) = 13264597 +SHA256 (catchorg-Catch2-v2.13.10_GH0.tar.gz) = d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943 +SIZE (catchorg-Catch2-v2.13.10_GH0.tar.gz) = 662225 SHA256 (mapbox-geometry.hpp-c83a2ab_GH0.tar.gz) = 676c7490fa7cdba26f45fc6b3932dc04bec110f75d660493a7c31d5b0d86e923 SIZE (mapbox-geometry.hpp-c83a2ab_GH0.tar.gz) = 17450 -SHA256 (mapbox-polylabel-51f09d0_GH0.tar.gz) = f060f7bce356379137cc9f9a7f3f94a00c3b456f8da4e230933bcfcd2f8210a3 -SIZE (mapbox-polylabel-51f09d0_GH0.tar.gz) = 43435 +SHA256 (mapbox-polylabel-0121820_GH0.tar.gz) = d4c6272980cf2fb1ad544aaab02b94fef61323ab8f7ad5899f1da82d8dbe4a63 +SIZE (mapbox-polylabel-0121820_GH0.tar.gz) = 56333 SHA256 (mapbox-variant-a2a4858_GH0.tar.gz) = e999758dd6f01bf15d176e5781aef17beb729e732559d67d0dac198858b657ed SIZE (mapbox-variant-a2a4858_GH0.tar.gz) = 128909 SHA256 (mapnik-mapnik-vector-tile-5a0cfbb_GH0.tar.gz) = 459428045397b5b46b06fa1a3e2604c503b9cba607c9cd5e2c6392502fb3a8f7 SIZE (mapnik-mapnik-vector-tile-5a0cfbb_GH0.tar.gz) = 3976592 -SHA256 (catchorg-Catch2-v2.13.10_GH0.tar.gz) = d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943 -SIZE (catchorg-Catch2-v2.13.10_GH0.tar.gz) = 662225 -SHA256 (mapnik-test-data-41c4cee_GH0.tar.gz) = 17f5645fad13b8d3296cae50caca9907effefccb1d5d335c446a5d2a55f99c04 -SIZE (mapnik-test-data-41c4cee_GH0.tar.gz) = 14062987 +SHA256 (mapnik-test-data-5716a27_GH0.tar.gz) = 2c4d2d513fffd9394869b325058ef30052fad40587647d1ac11f6bc30ba54308 +SIZE (mapnik-test-data-5716a27_GH0.tar.gz) = 14237135 diff --git a/graphics/mapnik/files/patch-plugins_input_tiles_pmtiles__source.hpp b/graphics/mapnik/files/patch-plugins_input_tiles_pmtiles__source.hpp index 725dbf74c1e1..5f266a6c709d 100644 --- a/graphics/mapnik/files/patch-plugins_input_tiles_pmtiles__source.hpp +++ b/graphics/mapnik/files/patch-plugins_input_tiles_pmtiles__source.hpp @@ -1,11 +1,20 @@ ---- plugins/input/tiles/pmtiles_source.hpp.orig 2025-09-17 23:55:13 UTC +--- plugins/input/tiles/pmtiles_source.hpp.orig 2025-10-05 04:06:02 UTC +++ plugins/input/tiles/pmtiles_source.hpp -@@ -511,7 +511,7 @@ class pmtiles_source : public tiles_source - } - else - { -- metadata = {data() + metadata_offset, metadata_length}; -+ metadata = {data() + metadata_offset, static_cast<size_t>(metadata_length)}; - } - boost::json::value json_value; - try +@@ -470,7 +470,7 @@ class pmtiles_source : public tiles_source, + { + std::string decompressed_dir; + #if defined(MAPNIK_MEMORY_MAPPED_FILE) +- std::string_view buffer{file_.buffer().first + dir_offset, dir_length}; ++ std::string_view buffer{file_.buffer().first + dir_offset, static_cast<std::size_t>(dir_length)}; + #else + std::string buffer; + buffer.resize(dir_length); +@@ -559,7 +559,7 @@ class pmtiles_source : public tiles_source, + { + std::string metadata; + #if defined(MAPNIK_MEMORY_MAPPED_FILE) +- std::string_view buffer{file_.buffer().first + metadata_offset_, metadata_length_}; ++ std::string_view buffer{file_.buffer().first + metadata_offset_, static_cast<std::size_t>(metadata_length_)}; + #else + std::string buffer; + buffer.resize(metadata_length_); diff --git a/graphics/mapnik/pkg-plist b/graphics/mapnik/pkg-plist index 7824e88970c5..2a61941bfd8a 100644 --- a/graphics/mapnik/pkg-plist +++ b/graphics/mapnik/pkg-plist @@ -546,7 +546,7 @@ lib/cmake/mapnik/mapnikUtilityTargets_svg2png-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/mapnik/mapnikUtilityTargets_svg2png.cmake lib/libmapnik.so lib/libmapnik.so.4.1 -lib/libmapnik.so.4.1.0 +lib/libmapnik.so.4.1.3 lib/libmapnikjson.a lib/libmapnikwkt.a lib/mapnik/input/csv.input @@ -559,7 +559,7 @@ lib/mapnik/input/postgis.input lib/mapnik/input/raster.input lib/mapnik/input/shape.input lib/mapnik/input/sqlite.input -%%NOTI386%%lib/mapnik/input/tiles.input +lib/mapnik/input/tiles.input lib/mapnik/input/topojson.input libdata/pkgconfig/libmapnik.pc libdata/pkgconfig/libmapnikjson.pchome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510082141.598Lf0oY086367>