Attachment 251554 Details for Bug 279844 – graphics/mapnik: Update to 4.0.0

[patch] graphics/mapnik: Update to 4.0.0

0001-graphics-mapnik-Update-to-4.0.0.patch (text/plain), 28.94 KB, created by David Hummel on 2024-06-19 00:40:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Hummel

Created: 2024-06-19 00:40:56 UTC

Size: 28.94 KB

patch

obsolete

>From 5e296a37ae0677ccaff0aba662bfbe6d7af9d5ab Mon Sep 17 00:00:00 2001
>From: David Hummel <hummeltech@sherpaguru.com>
>Date: Tue, 18 Jun 2024 16:45:40 -0700
>Subject: [PATCH] graphics/mapnik: Update to 4.0.0
>
>---
> graphics/mapnik/Makefile  | 162 ++++++++++++------------
> graphics/mapnik/distinfo  |  30 ++---
> graphics/mapnik/pkg-plist | 252 ++++++++++++++++++++++++++------------
> 3 files changed, 271 insertions(+), 173 deletions(-)
>
>diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
>index d79296ce63b8..1c5a78d166b0 100644
>--- a/graphics/mapnik/Makefile
>+++ b/graphics/mapnik/Makefile
>@@ -1,30 +1,19 @@
> PORTNAME=	mapnik
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	3.1.0
>-PORTREVISION=	9
>+DISTVERSION=	4.0.0
>+PORTREVISION=	1
> CATEGORIES=	graphics geography
>-MASTER_SITES=	https://github.com/mapnik/mapnik/releases/download/${DISTVERSIONFULL}/
>-
>-PATCH_SITES=	https://github.com/mapnik/mapnik/commit/
>-PATCHFILES=	8944e81367d2b3b91a41e24116e1813c01491e5d.patch \
>-		83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch \
>-		7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch \
>-		7da9009e7ffffb0b9429890f6f13fee837ac320f.patch \
>-		26eb76cc07210d564d80d98948770c94d27c5243.patch \
>-		08886e3b90f4d448308a46031eede879bb6ed74a.patch \
>-		5f1be6bba520151575811b13499a867c0f1dde2c.patch
>-PATCH_DIST_STRIP=	-p1 -F3
>-
>-MAINTAINER=	david.hummel@gmail.com
>+
>+MAINTAINER=	hummeltech@sherpaguru.com
> COMMENT=	Free Toolkit For Developing Mapping Applications
> WWW=		http://www.mapnik.org/
> 
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
>-LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
>-		libboost_program_options.so:devel/boost-libs \
>+BUILD_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
>+		protozero>0:devel/protozero
>+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
> 		libboost_regex.so:devel/boost-libs \
> 		libboost_system.so:devel/boost-libs \
> 		libfreetype.so:print/freetype2 \
>@@ -32,72 +21,97 @@ LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
> 		libicuuc.so:devel/icu
> RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu
> 
>-USES=		compiler:c++14-lang gmake gnome pkgconfig python tar:bzip2
>+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 \
>+		mapbox:variant:a2a4858:variant/deps/mapbox/variant \
>+		catchorg:Catch2:v2.13.10:catch2/test/catch2 \
>+		mapnik:test-data:fd9ab43:test_data/test/data
>+
>+USES=		compiler:c++17-lang cmake:testing gnome pkgconfig
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
>-MAKE_ARGS=	PYTHON="${PYTHON_CMD}"
>-MAKE_ENV=	JOBS=${MAKE_JOBS_NUMBER}
>-HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS=	CPP_TESTS=False \
>-		CUSTOM_CFLAGS="${CFLAGS}" \
>-		CUSTOM_CXXFLAGS="${CXXFLAGS}" \
>-		CUSTOM_LDFLAGS="${LDFLAGS}" \
>-		DEMO=False \
>-		DESTDIR="${STAGEDIR}" \
>-		INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" \
>-		PGSQL2SQLITE=True \
>-		SVG2PNG=True \
>-		SYSTEM_FONTS=${LOCALBASE}/share/fonts/dejavu \
>-		XMLPARSER=libxml2
>-CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}"
> 
>-PORTDOCS=	AUTHORS.md CHANGELOG.md CODE_OF_CONDUCT.md INSTALL.md README.md docs/*
>+CMAKE_ARGS=	-DFONTS_INSTALL_DIR:PATH=share/fonts/dejavu
>+CMAKE_ON=	USE_EXTERNAL_MAPBOX_PROTOZERO
> 
>-INPUT_PLUGINS=	csv raster shape geojson topojson
>+PORTDOCS=	AUTHORS.md CHANGELOG.md CODE_OF_CONDUCT.md INSTALL.md README.md docs/*
> 
> OPTIONS_DEFINE=		CAIRO DOCS JPEG PNG PROJ TIFF WEBP
>-OPTIONS_DEFAULT=	CAIRO GDAL JPEG OGR PGRASTER PNG POSTGIS PROJ SQLITE3 \
>-			TIFF WEBP
>-OPTIONS_GROUP=		INPUT
>+OPTIONS_DEFAULT=	CAIRO JPEG PNG PROJ TIFF WEBP \
>+			GDAL OGR PGRASTER POSTGIS SQLITE3 \
>+			TESTING \
>+			GEOMETRY_TO_WKB MAPNIK_INDEX MAPNIK_RENDER PGSQL2SQLITE SHAPEINDEX SVG2PNG
>+OPTIONS_GROUP=		INPUT TESTS UTILS
> OPTIONS_GROUP_INPUT=	GDAL OGR PGRASTER POSTGIS SQLITE3
>+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
> 
>-INPUT_DESC=	Input plugins
>-GDAL_DESC=	GDAL input plugin
>-OGR_DESC=	OGR input plugin
>-POSTGIS_DESC=	PostGIS input plugin
>-PGRASTER_DESC=	PGraster input plugin
>-SQLITE3_DESC=	SQLite input plugin
>-
>-PROJ_DESC=	PROJ support
>+JPEG_CMAKE_BOOL=	USE_JPEG
>+JPEG_USES=		jpeg
>+PNG_CMAKE_BOOL=		USE_PNG
>+PNG_LIB_DEPENDS=	libpng.so:graphics/png
>+TIFF_CMAKE_BOOL=	USE_TIFF
>+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
>+WEBP_CMAKE_BOOL=	USE_WEBP
>+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
> 
>-CAIRO_DESC=	Enable cairo rendering
>+CAIRO_DESC=		Enable cairo rendering
>+PROJ_DESC=		Enable PROJ support
>+
>+INPUT_DESC=		Input plugins
>+GDAL_DESC=		GDAL input plugin
>+OGR_DESC=		OGR input plugin
>+PGRASTER_DESC=		PGraster input plugin
>+POSTGIS_DESC=		PostGIS input plugin
>+SQLITE3_DESC=		SQLite input plugin
>+
>+TESTS_DESC=		Tests & Demos, etc.
>+BENCHMARK_DESC=		Benchmark project
>+DEMO_CPP_DESC=		Demo c++ application
>+DEMO_VIEWER_DESC=	Demo viewer
>+TESTING_DESC=		Tests
>+
>+UTILS_DESC=		Utilities
>+GEOMETRY_TO_WKB_DESC=	geometry_to_wkb utility
>+MAPNIK_INDEX_DESC=	mapnik_index utility
>+MAPNIK_RENDER_DESC=	mapnik_render utility
>+OGRINDEX_DESC=		ogrindex utility (currently doesn't build)
>+PGSQL2SQLITE_DESC=	pgsql2sqlite utility
>+SHAPEINDEX_DESC=	shapeindex utility
>+SVG2PNG_DESC=		svg2png utility
>+
>+CAIRO_CMAKE_BOOL=	USE_CAIRO
>+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
>+PROJ_CMAKE_BOOL=	USE_PROJ
>+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
> 
>-GDAL_VARS=		INPUT_PLUGINS+=gdal
>+GDAL_CMAKE_BOOL=	USE_PLUGIN_INPUT_GDAL
> GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
>-OGR_VARS=		INPUT_PLUGINS+=ogr
>+OGR_CMAKE_BOOL=		USE_PLUGIN_INPUT_OGR
> OGR_LIB_DEPENDS=	libgdal.so:graphics/gdal
>-POSTGIS_VARS=		INPUT_PLUGINS+=postgis
>-POSTGIS_USES=		pgsql
>-PGRASTER_VARS=		INPUT_PLUGINS+=pgraster
>+PGRASTER_CMAKE_BOOL=	USE_PLUGIN_INPUT_PGRASTER
> PGRASTER_USES=		pgsql
>-SQLITE3_VARS=		INPUT_PLUGINS+=sqlite
>+POSTGIS_CMAKE_BOOL=	USE_PLUGIN_INPUT_POSTGIS
>+POSTGIS_USES=		pgsql
>+SQLITE3_CMAKE_BOOL=	USE_PLUGIN_INPUT_SQLITE
> SQLITE3_USES=		sqlite:3
> 
>-PNG_LIB_DEPENDS=	libpng.so:graphics/png
>-PNG_MAKE_ARGS_OFF=	PNG=False
>-JPEG_USES=		jpeg
>-JPEG_MAKE_ARGS_OFF=	JPEG=False
>-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
>-TIFF_MAKE_ARGS_OFF=	TIFF=False
>-WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
>-WEBP_MAKE_ARGS_OFF=	WEBP=False
>-PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
>-PROJ_MAKE_ARGS_OFF=	PROJ=False
>+BENCHMARK_CMAKE_BOOL= 	BUILD_BENCHMARK
>+DEMO_CPP_CMAKE_BOOL= 	BUILD_DEMO_CPP
>+DEMO_VIEWER_CMAKE_BOOL=	BUILD_DEMO_VIEWER
>+TESTING_CMAKE_BOOL=	BUILD_TESTING
> 
>-CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
>-CAIRO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo@${PY_FLAVOR}
>-CAIRO_MAKE_ARGS_OFF=	CAIRO=False
>+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 \
>@@ -109,17 +123,13 @@ pre-configure-SQLITE3-on:
> 	fi
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
>-		-e 's#/usr/include#${LOCALBASE}/include#g' \
>-		-e "s#'/usr/' + LIBDIR_SCHEMA_DEFAULT#'${LOCALBASE}/' + LIBDIR_SCHEMA_DEFAULT#g" \
>-		${WRKSRC}/SConstruct
>+	@${REINPLACE_CMD} -e 's#GIT_REPOSITORY https://github.com/catchorg/Catch2.git#SOURCE_DIR ${WRKSRC}/test/catch2)#g' \
>+		-e 's#GIT_TAG        v2.13.7)##g' \
>+		${WRKSRC}/test/CMakeLists.txt
> 
> post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapnik-index \
>-		${STAGEDIR}${PREFIX}/bin/mapnik-render \
>-		${STAGEDIR}${PREFIX}/bin/pgsql2sqlite \
>-		${STAGEDIR}${PREFIX}/bin/shapeindex \
>-		${STAGEDIR}${PREFIX}/bin/svg2png
>+	@${RM} -r ${STAGEDIR}${PREFIX}/share/fonts
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mapnik/input/*.input
> 
>diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo
>index 5e36022ef7ad..e99fabc6656d 100644
>--- a/graphics/mapnik/distinfo
>+++ b/graphics/mapnik/distinfo
>@@ -1,17 +1,13 @@
>-TIMESTAMP = 1717522882
>-SHA256 (mapnik-v3.1.0.tar.bz2) = 43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261
>-SIZE (mapnik-v3.1.0.tar.bz2) = 10110740
>-SHA256 (8944e81367d2b3b91a41e24116e1813c01491e5d.patch) = a8c98fed2e0c72c2b48bf1ea81fe17dd79878429d82f32243ddcf61a5b4e4541
>-SIZE (8944e81367d2b3b91a41e24116e1813c01491e5d.patch) = 89836
>-SHA256 (83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch) = c80ca2cded88dfebff4efc92febb847fef1c8e3ade4795852ecf04a4b82724af
>-SIZE (83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch) = 698
>-SHA256 (7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch) = 2bb3ab61ed128fd5ae48e8e0943d8d0ae37b070418c21774ba987a4973f21800
>-SIZE (7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch) = 1071
>-SHA256 (7da9009e7ffffb0b9429890f6f13fee837ac320f.patch) = 819f81ab44dccc2af6eae36b53608cb422a08c9a3523563f371d6fd59058c341
>-SIZE (7da9009e7ffffb0b9429890f6f13fee837ac320f.patch) = 5657
>-SHA256 (26eb76cc07210d564d80d98948770c94d27c5243.patch) = a78ca7add5336f815867c65b80cb738c928a2b778082a314e4566428068d7919
>-SIZE (26eb76cc07210d564d80d98948770c94d27c5243.patch) = 2183
>-SHA256 (08886e3b90f4d448308a46031eede879bb6ed74a.patch) = 75c05edc0f9d2dc2ceeff4ab780ef87005cf1062e3e0e94722cfe94bb7f9eb10
>-SIZE (08886e3b90f4d448308a46031eede879bb6ed74a.patch) = 1908
>-SHA256 (5f1be6bba520151575811b13499a867c0f1dde2c.patch) = bc34c350e199f2bb835d50948677b532de7fc10a9c3c8db096357121ec2bfe7e
>-SIZE (5f1be6bba520151575811b13499a867c0f1dde2c.patch) = 786
>+TIMESTAMP = 1718750309
>+SHA256 (mapnik-mapnik-v4.0.0_GH0.tar.gz) = 2fc367ca6f932dda907df6db97b609006b26aa9f767930e737e3b07a66868a97
>+SIZE (mapnik-mapnik-v4.0.0_GH0.tar.gz) = 13214682
>+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-variant-a2a4858_GH0.tar.gz) = e999758dd6f01bf15d176e5781aef17beb729e732559d67d0dac198858b657ed
>+SIZE (mapbox-variant-a2a4858_GH0.tar.gz) = 128909
>+SHA256 (catchorg-Catch2-v2.13.10_GH0.tar.gz) = d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943
>+SIZE (catchorg-Catch2-v2.13.10_GH0.tar.gz) = 662225
>+SHA256 (mapnik-test-data-fd9ab43_GH0.tar.gz) = cb1d5add7a7a83eef5f3e54781bd889afc24c44a5abf77cc421cab3530968ba8
>+SIZE (mapnik-test-data-fd9ab43_GH0.tar.gz) = 14062753
>diff --git a/graphics/mapnik/pkg-plist b/graphics/mapnik/pkg-plist
>index 461d9cc6d300..6611bef4fe64 100644
>--- a/graphics/mapnik/pkg-plist
>+++ b/graphics/mapnik/pkg-plist
>@@ -1,9 +1,32 @@
>-bin/mapnik-config
>+bin/geometry_to_wkb
> bin/mapnik-index
> bin/mapnik-render
> bin/pgsql2sqlite
> bin/shapeindex
> bin/svg2png
>+include/mapbox/feature.hpp
>+include/mapbox/geometry.hpp
>+include/mapbox/geometry/box.hpp
>+include/mapbox/geometry/empty.hpp
>+include/mapbox/geometry/envelope.hpp
>+include/mapbox/geometry/for_each_point.hpp
>+include/mapbox/geometry/geometry.hpp
>+include/mapbox/geometry/line_string.hpp
>+include/mapbox/geometry/multi_line_string.hpp
>+include/mapbox/geometry/multi_point.hpp
>+include/mapbox/geometry/multi_polygon.hpp
>+include/mapbox/geometry/point.hpp
>+include/mapbox/geometry/point_arithmetic.hpp
>+include/mapbox/geometry/polygon.hpp
>+include/mapbox/geometry_io.hpp
>+include/mapbox/optional.hpp
>+include/mapbox/polylabel.hpp
>+include/mapbox/recursive_wrapper.hpp
>+include/mapbox/variant.hpp
>+include/mapbox/variant_cast.hpp
>+include/mapbox/variant_io.hpp
>+include/mapbox/variant_visitor.hpp
>+include/mapnik/adaptive_smooth.hpp
> include/mapnik/agg/agg_alpha_mask_u8.h
> include/mapnik/agg/agg_arc.h
> include/mapnik/agg/agg_array.h
>@@ -129,6 +152,7 @@ include/mapnik/agg/agg_vertex_sequence.h
> include/mapnik/agg/agg_vpgen_clip_polygon.h
> include/mapnik/agg/agg_vpgen_clip_polyline.h
> include/mapnik/agg/agg_vpgen_segmentator.h
>+include/mapnik/agg/render_polygon_pattern.hpp
> include/mapnik/agg_helpers.hpp
> include/mapnik/agg_pattern_source.hpp
> include/mapnik/agg_rasterizer.hpp
>@@ -138,8 +162,7 @@ include/mapnik/attribute.hpp
> include/mapnik/attribute_collector.hpp
> include/mapnik/attribute_descriptor.hpp
> include/mapnik/boolean.hpp
>-include/mapnik/box2d.hpp
>-include/mapnik/box2d_impl.hpp
>+include/mapnik/boost_spirit_instantiate.hpp
> include/mapnik/cairo/cairo_context.hpp
> include/mapnik/cairo/cairo_image_util.hpp
> include/mapnik/cairo/cairo_render_vector.hpp
>@@ -151,26 +174,30 @@ include/mapnik/color_factory.hpp
> include/mapnik/config.hpp
> include/mapnik/config_error.hpp
> include/mapnik/coord.hpp
>-include/mapnik/css_color_grammar.hpp
>-include/mapnik/css_color_grammar_impl.hpp
>-include/mapnik/csv/csv_grammar.hpp
>-include/mapnik/csv/csv_grammar_impl.hpp
>+include/mapnik/css/css_color_grammar_x3.hpp
>+include/mapnik/css/css_color_grammar_x3_def.hpp
>+include/mapnik/css/css_grammar_x3.hpp
>+include/mapnik/css/css_grammar_x3_def.hpp
>+include/mapnik/css/css_unit_value.hpp
>+include/mapnik/csv/csv_grammar_x3.hpp
>+include/mapnik/csv/csv_grammar_x3_def.hpp
> include/mapnik/csv/csv_types.hpp
>-include/mapnik/cxx11_support.hpp
> include/mapnik/datasource.hpp
> include/mapnik/datasource_cache.hpp
> include/mapnik/datasource_geometry_type.hpp
>+include/mapnik/datasource_plugin.hpp
> include/mapnik/debug.hpp
>-include/mapnik/ellipsoid.hpp
> include/mapnik/enumeration.hpp
> include/mapnik/evaluate_global_attributes.hpp
> include/mapnik/expression.hpp
> include/mapnik/expression_evaluator.hpp
>-include/mapnik/expression_grammar.hpp
>-include/mapnik/expression_grammar_impl.hpp
>+include/mapnik/expression_grammar_x3.hpp
>+include/mapnik/expression_grammar_x3_config.hpp
>+include/mapnik/expression_grammar_x3_def.hpp
> include/mapnik/expression_node.hpp
> include/mapnik/expression_node_types.hpp
> include/mapnik/expression_string.hpp
>+include/mapnik/extend_converter.hpp
> include/mapnik/factory.hpp
> include/mapnik/feature.hpp
> include/mapnik/feature_factory.hpp
>@@ -181,30 +208,43 @@ include/mapnik/feature_style_processor_context.hpp
> include/mapnik/feature_style_processor_impl.hpp
> include/mapnik/feature_type_style.hpp
> include/mapnik/featureset.hpp
>-include/mapnik/filter_factory.hpp
>+include/mapnik/filesystem.hpp
> include/mapnik/filter_featureset.hpp
> include/mapnik/font_engine_freetype.hpp
> include/mapnik/font_set.hpp
> include/mapnik/function_call.hpp
> include/mapnik/geom_util.hpp
> include/mapnik/geometry.hpp
>-include/mapnik/geometry_adapters.hpp
>-include/mapnik/geometry_centroid.hpp
>-include/mapnik/geometry_correct.hpp
>-include/mapnik/geometry_envelope.hpp
>-include/mapnik/geometry_envelope_impl.hpp
>-include/mapnik/geometry_fusion_adapted.hpp
>-include/mapnik/geometry_is_empty.hpp
>-include/mapnik/geometry_is_simple.hpp
>-include/mapnik/geometry_is_valid.hpp
>-include/mapnik/geometry_remove_empty.hpp
>-include/mapnik/geometry_reprojection.hpp
>-include/mapnik/geometry_reprojection_impl.hpp
>-include/mapnik/geometry_strategy.hpp
>-include/mapnik/geometry_to_path.hpp
>-include/mapnik/geometry_transform.hpp
>-include/mapnik/geometry_type.hpp
>-include/mapnik/geometry_types.hpp
>+include/mapnik/geometry/boost_adapters.hpp
>+include/mapnik/geometry/boost_spirit_karma_adapter.hpp
>+include/mapnik/geometry/box2d.hpp
>+include/mapnik/geometry/box2d_impl.hpp
>+include/mapnik/geometry/centroid.hpp
>+include/mapnik/geometry/closest_point.hpp
>+include/mapnik/geometry/correct.hpp
>+include/mapnik/geometry/envelope.hpp
>+include/mapnik/geometry/envelope_impl.hpp
>+include/mapnik/geometry/fusion_adapted.hpp
>+include/mapnik/geometry/geometry_type.hpp
>+include/mapnik/geometry/geometry_types.hpp
>+include/mapnik/geometry/interior.hpp
>+include/mapnik/geometry/is_empty.hpp
>+include/mapnik/geometry/is_simple.hpp
>+include/mapnik/geometry/is_valid.hpp
>+include/mapnik/geometry/line_string.hpp
>+include/mapnik/geometry/multi_line_string.hpp
>+include/mapnik/geometry/multi_point.hpp
>+include/mapnik/geometry/multi_polygon.hpp
>+include/mapnik/geometry/point.hpp
>+include/mapnik/geometry/polygon.hpp
>+include/mapnik/geometry/polygon_vertex_processor.hpp
>+include/mapnik/geometry/polylabel.hpp
>+include/mapnik/geometry/remove_empty.hpp
>+include/mapnik/geometry/reprojection.hpp
>+include/mapnik/geometry/reprojection_impl.hpp
>+include/mapnik/geometry/strategy.hpp
>+include/mapnik/geometry/to_path.hpp
>+include/mapnik/geometry/transform.hpp
> include/mapnik/global.hpp
> include/mapnik/gradient.hpp
> include/mapnik/grid/grid.hpp
>@@ -229,8 +269,8 @@ include/mapnik/image_any.hpp
> include/mapnik/image_compositing.hpp
> include/mapnik/image_copy.hpp
> include/mapnik/image_filter.hpp
>-include/mapnik/image_filter_grammar.hpp
>-include/mapnik/image_filter_grammar_impl.hpp
>+include/mapnik/image_filter_grammar_x3.hpp
>+include/mapnik/image_filter_grammar_x3_def.hpp
> include/mapnik/image_filter_types.hpp
> include/mapnik/image_impl.hpp
> include/mapnik/image_null.hpp
>@@ -249,45 +289,43 @@ include/mapnik/image_view_impl.hpp
> include/mapnik/image_view_null.hpp
> include/mapnik/jpeg_io.hpp
> include/mapnik/json/attribute_value_visitor.hpp
>-include/mapnik/json/error_handler.hpp
>-include/mapnik/json/extract_bounding_box_grammar.hpp
>-include/mapnik/json/extract_bounding_box_grammar_impl.hpp
>-include/mapnik/json/feature_collection_grammar.hpp
>-include/mapnik/json/feature_collection_grammar_impl.hpp
>-include/mapnik/json/feature_generator.hpp
>+include/mapnik/json/create_feature.hpp
>+include/mapnik/json/create_geometry.hpp
>+include/mapnik/json/extract_bounding_boxes_x3.hpp
>+include/mapnik/json/extract_bounding_boxes_x3_config.hpp
> include/mapnik/json/feature_generator_grammar.hpp
> include/mapnik/json/feature_generator_grammar_impl.hpp
>-include/mapnik/json/feature_grammar.hpp
>-include/mapnik/json/feature_grammar_impl.hpp
>+include/mapnik/json/feature_grammar_x3.hpp
>+include/mapnik/json/feature_grammar_x3_def.hpp
> include/mapnik/json/feature_parser.hpp
>-include/mapnik/json/generic_json.hpp
>+include/mapnik/json/generic_json_grammar_x3.hpp
>+include/mapnik/json/generic_json_grammar_x3_def.hpp
>+include/mapnik/json/geojson_grammar_x3.hpp
>+include/mapnik/json/geojson_grammar_x3_def.hpp
> include/mapnik/json/geometry_generator_grammar.hpp
> include/mapnik/json/geometry_generator_grammar_impl.hpp
>-include/mapnik/json/geometry_grammar.hpp
>-include/mapnik/json/geometry_grammar_impl.hpp
> include/mapnik/json/geometry_parser.hpp
>-include/mapnik/json/geometry_util.hpp
>-include/mapnik/json/positions.hpp
>-include/mapnik/json/positions_grammar.hpp
>-include/mapnik/json/positions_grammar_impl.hpp
>+include/mapnik/json/json_grammar_config.hpp
>+include/mapnik/json/json_value.hpp
>+include/mapnik/json/parse_feature.hpp
>+include/mapnik/json/positions_grammar_x3.hpp
>+include/mapnik/json/positions_grammar_x3_def.hpp
>+include/mapnik/json/positions_x3.hpp
> include/mapnik/json/properties_generator_grammar.hpp
> include/mapnik/json/properties_generator_grammar_impl.hpp
> include/mapnik/json/stringifier.hpp
>-include/mapnik/json/topojson_grammar.hpp
>-include/mapnik/json/topojson_grammar_impl.hpp
>+include/mapnik/json/topojson_grammar_x3.hpp
>+include/mapnik/json/topojson_grammar_x3_def.hpp
> include/mapnik/json/topojson_utils.hpp
> include/mapnik/json/topology.hpp
>+include/mapnik/json/unicode_string_grammar_x3.hpp
>+include/mapnik/json/unicode_string_grammar_x3_def.hpp
> include/mapnik/json/value_converters.hpp
> include/mapnik/label_collision_detector.hpp
> include/mapnik/layer.hpp
> include/mapnik/load_map.hpp
>-include/mapnik/make_unique.hpp
> include/mapnik/map.hpp
>-include/mapnik/mapbox/optional.hpp
>-include/mapnik/mapbox/recursive_wrapper.hpp
>-include/mapnik/mapbox/variant.hpp
>-include/mapnik/mapbox/variant_io.hpp
>-include/mapnik/mapbox/variant_visitor.hpp
>+include/mapnik/mapnik.hpp
> include/mapnik/mapped_memory_cache.hpp
> include/mapnik/marker.hpp
> include/mapnik/marker_cache.hpp
>@@ -297,8 +335,9 @@ include/mapnik/markers_placements/basic.hpp
> include/mapnik/markers_placements/interior.hpp
> include/mapnik/markers_placements/line.hpp
> include/mapnik/markers_placements/point.hpp
>-include/mapnik/markers_placements/vertext_first.hpp
>-include/mapnik/markers_placements/vertext_last.hpp
>+include/mapnik/markers_placements/polylabel.hpp
>+include/mapnik/markers_placements/vertex_first.hpp
>+include/mapnik/markers_placements/vertex_last.hpp
> include/mapnik/memory_datasource.hpp
> include/mapnik/memory_featureset.hpp
> include/mapnik/octree.hpp
>@@ -307,11 +346,10 @@ include/mapnik/palette.hpp
> include/mapnik/params.hpp
> include/mapnik/params_impl.hpp
> include/mapnik/parse_path.hpp
>-include/mapnik/parse_transform.hpp
> include/mapnik/path.hpp
> include/mapnik/path_expression.hpp
>-include/mapnik/path_expression_grammar.hpp
>-include/mapnik/path_expression_grammar_impl.hpp
>+include/mapnik/path_expression_grammar_x3.hpp
>+include/mapnik/path_expression_grammar_x3_def.hpp
> include/mapnik/pixel_position.hpp
> include/mapnik/pixel_types.hpp
> include/mapnik/plugin.hpp
>@@ -319,6 +357,7 @@ include/mapnik/png_io.hpp
> include/mapnik/pool.hpp
> include/mapnik/proj_strategy.hpp
> include/mapnik/proj_transform.hpp
>+include/mapnik/proj_transform_cache.hpp
> include/mapnik/projection.hpp
> include/mapnik/ptree_helpers.hpp
> include/mapnik/quad_tree.hpp
>@@ -326,13 +365,24 @@ include/mapnik/query.hpp
> include/mapnik/raster.hpp
> include/mapnik/raster_colorizer.hpp
> include/mapnik/renderer_common.hpp
>+include/mapnik/renderer_common/apply_vertex_converter.hpp
>+include/mapnik/renderer_common/clipping_extent.hpp
>+include/mapnik/renderer_common/pattern_alignment.hpp
>+include/mapnik/renderer_common/process_building_symbolizer.hpp
>+include/mapnik/renderer_common/process_point_symbolizer.hpp
>+include/mapnik/renderer_common/process_polygon_symbolizer.hpp
>+include/mapnik/renderer_common/process_raster_symbolizer.hpp
>+include/mapnik/renderer_common/render_group_symbolizer.hpp
>+include/mapnik/renderer_common/render_markers_symbolizer.hpp
>+include/mapnik/renderer_common/render_pattern.hpp
>+include/mapnik/renderer_common/render_thunk.hpp
>+include/mapnik/renderer_common/render_thunk_extractor.hpp
> include/mapnik/request.hpp
> include/mapnik/rule.hpp
> include/mapnik/rule_cache.hpp
> include/mapnik/safe_cast.hpp
> include/mapnik/save_map.hpp
> include/mapnik/scale_denominator.hpp
>-include/mapnik/segment.hpp
> include/mapnik/simplify.hpp
> include/mapnik/simplify_converter.hpp
> include/mapnik/span_image_filter.hpp
>@@ -348,21 +398,28 @@ include/mapnik/sse.hpp
> include/mapnik/stringify_macro.hpp
> include/mapnik/svg/geometry_svg_generator.hpp
> include/mapnik/svg/geometry_svg_generator_impl.hpp
>+include/mapnik/svg/output/svg_generator.hpp
>+include/mapnik/svg/output/svg_output_attributes.hpp
>+include/mapnik/svg/output/svg_output_grammars.hpp
>+include/mapnik/svg/output/svg_output_grammars_impl.hpp
>+include/mapnik/svg/output/svg_path_iterator.hpp
>+include/mapnik/svg/output/svg_renderer.hpp
>+include/mapnik/svg/svg_bounding_box.hpp
> include/mapnik/svg/svg_converter.hpp
>+include/mapnik/svg/svg_grammar_config_x3.hpp
>+include/mapnik/svg/svg_group.hpp
> include/mapnik/svg/svg_parser.hpp
> include/mapnik/svg/svg_parser_exception.hpp
> include/mapnik/svg/svg_path_adapter.hpp
> include/mapnik/svg/svg_path_attributes.hpp
> include/mapnik/svg/svg_path_commands.hpp
>-include/mapnik/svg/svg_path_grammar.hpp
>-include/mapnik/svg/svg_path_grammar_impl.hpp
>+include/mapnik/svg/svg_path_grammar_x3.hpp
>+include/mapnik/svg/svg_path_grammar_x3_def.hpp
> include/mapnik/svg/svg_path_parser.hpp
>-include/mapnik/svg/svg_points_grammar.hpp
>-include/mapnik/svg/svg_points_grammar_impl.hpp
> include/mapnik/svg/svg_renderer_agg.hpp
> include/mapnik/svg/svg_storage.hpp
>-include/mapnik/svg/svg_transform_grammar.hpp
>-include/mapnik/svg/svg_transform_grammar_impl.hpp
>+include/mapnik/svg/svg_transform_grammar_x3.hpp
>+include/mapnik/svg/svg_transform_grammar_x3_def.hpp
> include/mapnik/symbolizer.hpp
> include/mapnik/symbolizer_base.hpp
> include/mapnik/symbolizer_default_values.hpp
>@@ -371,6 +428,7 @@ include/mapnik/symbolizer_enumerations.hpp
> include/mapnik/symbolizer_hash.hpp
> include/mapnik/symbolizer_keys.hpp
> include/mapnik/symbolizer_utils.hpp
>+include/mapnik/text/color_font_renderer.hpp
> include/mapnik/text/evaluated_format_properties_ptr.hpp
> include/mapnik/text/face.hpp
> include/mapnik/text/font_feature_settings.hpp
>@@ -395,7 +453,6 @@ include/mapnik/text/placements/registry.hpp
> include/mapnik/text/placements/simple.hpp
> include/mapnik/text/properties_util.hpp
> include/mapnik/text/renderer.hpp
>-include/mapnik/text/rotation.hpp
> include/mapnik/text/scrptrun.hpp
> include/mapnik/text/symbolizer_helpers.hpp
> include/mapnik/text/text_layout.hpp
>@@ -404,11 +461,12 @@ include/mapnik/text/text_properties.hpp
> include/mapnik/tiff_io.hpp
> include/mapnik/timer.hpp
> include/mapnik/tolerance_iterator.hpp
>-include/mapnik/transform_expression.hpp
>-include/mapnik/transform_expression_grammar.hpp
>-include/mapnik/transform_expression_grammar_impl.hpp
>+include/mapnik/transform/parse_transform.hpp
>+include/mapnik/transform/transform_expression.hpp
>+include/mapnik/transform/transform_expression_grammar_x3.hpp
>+include/mapnik/transform/transform_expression_grammar_x3_def.hpp
>+include/mapnik/transform/transform_processor.hpp
> include/mapnik/transform_path_adapter.hpp
>-include/mapnik/transform_processor.hpp
> include/mapnik/unicode.hpp
> include/mapnik/util/char_array_buffer.hpp
> include/mapnik/util/const_rendering_buffer.hpp
>@@ -418,6 +476,7 @@ include/mapnik/util/dasharray_parser.hpp
> include/mapnik/util/feature_to_geojson.hpp
> include/mapnik/util/featureset_buffer.hpp
> include/mapnik/util/file_io.hpp
>+include/mapnik/util/from_u8string.hpp
> include/mapnik/util/fs.hpp
> include/mapnik/util/geometry_to_ds_type.hpp
> include/mapnik/util/geometry_to_geojson.hpp
>@@ -426,6 +485,7 @@ include/mapnik/util/geometry_to_wkb.hpp
> include/mapnik/util/geometry_to_wkt.hpp
> include/mapnik/util/hsl.hpp
> include/mapnik/util/is_clockwise.hpp
>+include/mapnik/util/mapped_memory_file.hpp
> include/mapnik/util/math.hpp
> include/mapnik/util/name_to_int.hpp
> include/mapnik/util/noncopyable.hpp
>@@ -439,9 +499,9 @@ include/mapnik/util/utf_conv_win.hpp
> include/mapnik/util/variant.hpp
> include/mapnik/util/variant_io.hpp
> include/mapnik/value.hpp
>-include/mapnik/value_error.hpp
>-include/mapnik/value_hash.hpp
>-include/mapnik/value_types.hpp
>+include/mapnik/value/error.hpp
>+include/mapnik/value/hash.hpp
>+include/mapnik/value/types.hpp
> include/mapnik/version.hpp
> include/mapnik/vertex.hpp
> include/mapnik/vertex_adapters.hpp
>@@ -451,6 +511,7 @@ include/mapnik/vertex_processor.hpp
> include/mapnik/vertex_vector.hpp
> include/mapnik/view_strategy.hpp
> include/mapnik/view_transform.hpp
>+include/mapnik/warning.hpp
> include/mapnik/warning_ignore.hpp
> include/mapnik/warning_ignore_agg.hpp
> include/mapnik/warp.hpp
>@@ -460,19 +521,36 @@ include/mapnik/wkb.hpp
> include/mapnik/wkt/wkt_factory.hpp
> include/mapnik/wkt/wkt_generator_grammar.hpp
> include/mapnik/wkt/wkt_generator_grammar_impl.hpp
>-include/mapnik/wkt/wkt_grammar.hpp
>-include/mapnik/wkt/wkt_grammar_impl.hpp
>+include/mapnik/wkt/wkt_grammar_x3.hpp
>+include/mapnik/wkt/wkt_grammar_x3_def.hpp
> include/mapnik/xml_attribute_cast.hpp
> include/mapnik/xml_loader.hpp
> include/mapnik/xml_node.hpp
> include/mapnik/xml_tree.hpp
>-lib/libmapnik-json.a
>-lib/libmapnik-wkt.a
>+lib/cmake/mapnik/mapnikConfig.cmake
>+lib/cmake/mapnik/mapnikConfigVersion.cmake
>+lib/cmake/mapnik/mapnikPlugins-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikTargets.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_geometry_to_wkb-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_geometry_to_wkb.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_mapnik-index-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_mapnik-index.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_mapnik-render-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_mapnik-render.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_pgsql2sqlite-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_pgsql2sqlite.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_shapeindex-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_shapeindex.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_svg2png-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/mapnik/mapnikUtilityTargets_svg2png.cmake
> lib/libmapnik.so
>-lib/libmapnik.so.3.1
>-lib/libmapnik.so.3.1.0
>+lib/libmapnik.so.%%GTK4_VERSION%%
>+lib/libmapnikjson.a
>+lib/libmapnikwkt.a
> lib/mapnik/input/csv.input
> lib/mapnik/input/gdal.input
>+lib/mapnik/input/geobuf.input
> lib/mapnik/input/geojson.input
> lib/mapnik/input/ogr.input
> lib/mapnik/input/pgraster.input
>@@ -481,3 +559,17 @@ lib/mapnik/input/raster.input
> lib/mapnik/input/shape.input
> lib/mapnik/input/sqlite.input
> lib/mapnik/input/topojson.input
>+libdata/pkgconfig/libmapnik.pc
>+libdata/pkgconfig/libmapnikjson.pc
>+libdata/pkgconfig/libmapnikwkt.pc
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.md
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
>+%%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
>+%%PORTDOCS%%%%DOCSDIR%%/README.md
>+%%PORTDOCS%%%%DOCSDIR%%/docs/cmake-usage.md
>+%%PORTDOCS%%%%DOCSDIR%%/docs/contributing.md
>+%%PORTDOCS%%%%DOCSDIR%%/docs/design.md
>+%%PORTDOCS%%%%DOCSDIR%%/docs/textrendering.gv
>+%%PORTDOCS%%%%DOCSDIR%%/docs/textrendering.png
>+%%PORTDOCS%%%%DOCSDIR%%/docs/textrendering.svg
>-- 
>2.45.2
>

Flags:

hummeltech: maintainer-approval+

Actions: View | Diff

Attachments on bug 279844: 251552 | 251554