Update to mapnik 2.2.0.

Fix depends, remove cairomm/libtool,-ltdl & agg. Mapnik uses its own
internal agg fork now. Fix WANTLIB while here, and ensure dependency on
png 1.6, otherwise build breaks horribly.
Force the dependency on scons 2.3.0, newer mapnik switched from CXXFLAGS
to CPPDEFINES, and with previous scons this produces broken build flags like
-DHAVE_JPEG-DMAPNIK_USE_PROJ4-DHAVE_PNG-DHAVE_TIFF-DBIGINT-DOPENBSD-DMAPNIK_THREADSAFE
in turn producing broken builds.
Add a warning about the 'dangerous' regress tests.
This commit is contained in:
landry 2013-07-06 11:19:48 +00:00
parent 755557c286
commit 47e2e40500
6 changed files with 301 additions and 106 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2013/06/04 18:41:49 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2013/07/06 11:19:48 landry Exp $
COMMENT = toolkit for developing mapping applications
DISTNAME = mapnik-v2.0.1
DISTNAME = mapnik-v2.2.0
PKGNAME = ${DISTNAME:S/v//}
EXTRACT_SUFX = .tar.bz2
REVISION= 1
SHARED_LIBS = mapnik 1.0 #2.0
SHARED_LIBS = mapnik 2.0 #2.0
CATEGORIES = graphics geo
HOMEPAGE = http://mapnik.org/
@ -16,38 +15,36 @@ MAINTAINER = Landry Breuil <landry@openbsd.org>
# LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = https://github.com/downloads/mapnik/mapnik/
MODULES = devel/gettext \
devel/scons \
MASTER_SITES = http://mapnik.s3.amazonaws.com/dist/v2.2.0/
MODULES = devel/scons \
lang/python
VMEM_WARNING = Yes
TEST_DEPENDS = devel/py-nose
BUILD_DEPENDS = graphics/py-cairo
TEST_DEPENDS = devel/py-nose \
${BUILD_PKGPATH}
LIB_DEPENDS = devel/boost \
graphics/cairomm \
graphics/agg \
BUILD_DEPENDS = graphics/py-cairo \
devel/scons>=2.3.0
LIB_DEPENDS = devel/boost>=1.47 \
graphics/cairo \
devel/proj \
devel/libtool,-ltdl \
geo/gdal \
textproc/icu4c
WANTLIB = cairomm-1.0 cairo icuuc ltdl png pq proj jpeg \
WANTLIB = cairo icuuc png>=17.0 pq proj jpeg \
boost_filesystem-mt tiff sqlite3 \
boost_program_options-mt boost_python-mt \
boost_regex-mt boost_system-mt boost_thread-mt \
c freetype m stdc++ xml2 z curl gdal agg
WANTLIB += X11 Xau Xdmcp Xext Xrender fontconfig glib-2.0 gobject-2.0
WANTLIB += pcre pixman-1 pthread pthread-stubs sigc-2.0 xcb xcb-render
WANTLIB += xcb-shm
c freetype m stdc++ xml2 z curl gdal \
X11 Xau Xdmcp Xext Xrender fontconfig glib-2.0 \
gobject-2.0 intl pcre pixman-1 pthread-stubs \
xcb xcb-render xcb-shm pthread
MODSCONS_FLAGS = PREFIX="${TRUEPREFIX}" \
DESTDIR="${WRKINST}" \
PNG_INCLUDES="${LOCALBASE}/include" \
INTERNAL_LIBAGG=no \
PNG_LIBS="${LOCALBASE}/lib" \
SYSTEM_FONTS="${X11BASE}/lib/X11/fonts/TTF/" \
FAST=yes \
INPUT_PLUGINS=raster,postgis,shape,gdal,ogr,osm,sqlite
@ -57,6 +54,10 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/src/build.py
do-test:
# warning: some tests may swap your machine to death
# python_tests.datasource_test.test_hit_grid may stall gobbling all cpu
# python_tests.geometry_io_test.test_wkb_parsing may segfault
# tests involving unicode/utf fail
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} tests/run_tests.py
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (mapnik-v2.0.1.tar.bz2) = 490JmRNA4laLmfRrrDSwqA==
RMD160 (mapnik-v2.0.1.tar.bz2) = 8AG7MfX5sMIQ+YAO0Cgy7PmT7AU=
SHA1 (mapnik-v2.0.1.tar.bz2) = CuajOOPdtIC1P7e7yYTEsEea74g=
SHA256 (mapnik-v2.0.1.tar.bz2) = /j2gsa27SPVevQGrDpXlGD9RIVQknx1Ae35ZqpF2uow=
SIZE (mapnik-v2.0.1.tar.bz2) = 12018783
SHA256 (mapnik-v2.2.0.tar.bz2) = mzDeTlitxtWqhHh3nQpH/avmv4sWa2ejg7NfWqXWwbA=
SIZE (mapnik-v2.2.0.tar.bz2) = 23007178

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-SConstruct,v 1.2 2012/05/03 08:48:26 landry Exp $
--- SConstruct.orig Tue Apr 10 00:56:48 2012
+++ SConstruct Wed May 2 22:39:34 2012
@@ -1028,6 +1028,11 @@ if not preconfigured:
$OpenBSD: patch-SConstruct,v 1.3 2013/07/06 11:19:48 landry Exp $
--- SConstruct.orig Tue Jun 4 03:35:26 2013
+++ SConstruct Sun Jun 23 22:58:43 2013
@@ -1122,6 +1122,11 @@ if not preconfigured:
thread_suffix = ''
env.Append(LIBS = 'pthread')
@ -13,12 +13,13 @@ $OpenBSD: patch-SConstruct,v 1.2 2012/05/03 08:48:26 landry Exp $
# Solaris & Sun Studio settings (the `SUNCC` flag will only be
# set if the `CXX` option begins with `CC`)
SOLARIS = env['PLATFORM'] == 'SunOS'
@@ -1145,6 +1150,8 @@ if not preconfigured:
# of attaching to cxxflags after configure
if env['PLATFORM'] == 'SunOS':
env.Append(CXXFLAGS = '-pthreads')
+ if env['PLATFORM'] == 'OpenBSD':
+ env.Append(CXXFLAGS = '-pthread')
@@ -1277,6 +1282,9 @@ if not preconfigured:
# of attaching to cxxflags after configure
if env['PLATFORM'] == 'SunOS':
env.Append(CXXFLAGS = '-pthreads')
+ if env['PLATFORM'] == 'OpenBSD':
+ env.Append(CXXFLAGS = '-pthread')
+
# if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
if env['PRIORITIZE_LINKING']:
# if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
if env['PRIORITIZE_LINKING']:

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-bindings_python_build_py,v 1.1 2012/05/03 08:48:26 landry Exp $
paths.py ends up with an insane ../../../ garbage pointing to /local otherwise
--- bindings/python/build.py.orig Thu May 3 00:00:31 2012
+++ bindings/python/build.py Thu May 3 00:03:21 2012
@@ -143,10 +143,7 @@ paths += "__all__ = [mapniklibpath,inputpluginspath,fo
if not os.path.exists('mapnik'):
os.mkdir('mapnik')
-if hasattr(os.path,'relpath'): # python 2.6 and above
- file('mapnik/paths.py','w').write(paths % (os.path.relpath(env['MAPNIK_LIB_DIR'],target_path)))
-else:
- file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
+file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
# force open perms temporarily so that `sudo scons install`
# does not later break simple non-install non-sudo rebuild

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_build_py,v 1.2 2012/05/05 07:05:16 landry Exp $
$OpenBSD: patch-src_build_py,v 1.3 2013/07/06 11:19:48 landry Exp $
Set shlib version, don't do stupid symlinks, dont call ldconfig
--- src/build.py.orig Tue Apr 10 00:56:48 2012
+++ src/build.py Sat May 5 08:15:49 2012
--- src/build.py.orig Tue Jun 4 03:35:27 2013
+++ src/build.py Sat Jul 6 13:13:32 2013
@@ -37,9 +37,6 @@ def call(cmd, silent=True):
elif not silent:
print stderr
@ -12,44 +12,54 @@ Set shlib version, don't do stupid symlinks, dont call ldconfig
if env['LINKING'] == 'static':
lib_env.Append(CXXFLAGS="-fPIC")
@@ -81,7 +78,7 @@ if not env['RUNTIME_LINK'] == 'static':
if env['PLATFORM'] == 'Darwin':
mapnik_libname = 'libmapnik.dylib'
else:
- mapnik_libname = 'libmapnik.so.' + ("%d.%d" % (int(ABI_VERSION[0]),int(ABI_VERSION[1])))
@@ -98,7 +95,7 @@ if env['PLATFORM'] == 'Darwin':
_d = {'version':env['MAPNIK_VERSION_STRING'].replace('-pre','')}
mapnik_lib_link_flag += ' -current_version %(version)s -compatibility_version %(version)s' % _d
else: # unix, non-macos
- mapnik_libname = env.subst(env['MAPNIK_LIB_NAME']) + (".%d.%d" % (int(ABI_VERSION[0]),int(ABI_VERSION[1])))
+ mapnik_libname = 'libmapnik.so.${LIBmapnik_VERSION}'
if env['PLATFORM'] == 'Darwin':
if env['FULL_LIB_PATH']:
@@ -325,30 +322,13 @@ if env['PLATFORM'] != 'Darwin':
if env['PLATFORM'] == 'SunOS':
if env['CXX'].startswith('CC'):
mapnik_lib_link_flag += ' -R. -h %s' % mapnik_libname
@@ -421,9 +418,7 @@ else:
os.remove(trgt)
os.symlink(os.path.basename(src), trgt)
- major, minor, micro = ABI_VERSION
-
- soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
+ soFile = "%s.${LIBmapnik_VERSION}" % (os.path.basename(str(mapnik[0])))
-
- soFile = "%s.%d.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor), int(micro))
+ soFile = "%s.${LIBmapnik_VERSION}" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])))
target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
if 'uninstall' not in COMMAND_LINE_TARGETS:
result = env.InstallAs(target=target, source=mapnik)
env.Alias(target='install', source=result)
- if result:
- env.AddPostAction(result, ldconfig)
-
if 'uninstall' not in COMMAND_LINE_TARGETS:
@@ -433,30 +428,8 @@ else:
mapnik = lib_env_final.SharedLibrary('mapnik', source)
result = env.InstallAs(target=target, source=mapnik)
env.Alias(target='install', source=result)
- if result:
- env.AddPostAction(result, ldconfig)
- # Install symlinks
- target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % (os.path.basename(str(mapnik[0])),int(major), int(minor)))
- target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(str(mapnik[0])))
- target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % \
- (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major), int(minor)))
- target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])))
- if 'uninstall' not in COMMAND_LINE_TARGETS:
- if 'install' in COMMAND_LINE_TARGETS:
- link1 = env.Command(target1, target, symlink)
- env.Alias(target='install', source=link1)
- link2 = env.Command(target2, target1, symlink)
- env.Alias(target='install', source=link2)
- link1 = env.Command(target1, target, symlink)
- env.Alias(target='install', source=link1)
- link2 = env.Command(target2, target1, symlink)
- env.Alias(target='install', source=link2)
- # delete in reverse order..
- env['create_uninstall_target'](env, target2)
- env['create_uninstall_target'](env, target1)
env['create_uninstall_target'](env, target)
-
- # to enable local testing
- lib_major_minor = "%s.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor))
- local_lib = os.path.basename(env.subst(env['MAPNIK_LIB_NAME']))
- if os.path.islink(lib_major_minor) or os.path.exists(lib_major_minor):
- os.remove(lib_major_minor)
- os.symlink(local_lib,lib_major_minor)
- Clean(mapnik,lib_major_minor);
else:
if not env['RUNTIME_LINK'] == 'static':
Depends(mapnik, env.subst('../deps/agg/libagg.a'))

View File

@ -1,18 +1,148 @@
@comment $OpenBSD: PLIST,v 1.2 2012/05/03 08:48:26 landry Exp $
@comment $OpenBSD: PLIST,v 1.3 2013/07/06 11:19:48 landry Exp $
bin/mapnik-config
bin/mapnik-speed-check
@bin bin/shapeindex
bin/upgrade_map_xml.py
include/mapnik/
include/mapnik/agg/
include/mapnik/agg/agg_alpha_mask_u8.h
include/mapnik/agg/agg_arc.h
include/mapnik/agg/agg_array.h
include/mapnik/agg/agg_arrowhead.h
include/mapnik/agg/agg_basics.h
include/mapnik/agg/agg_bezier_arc.h
include/mapnik/agg/agg_bitset_iterator.h
include/mapnik/agg/agg_blur.h
include/mapnik/agg/agg_bounding_rect.h
include/mapnik/agg/agg_bspline.h
include/mapnik/agg/agg_clip_liang_barsky.h
include/mapnik/agg/agg_color_gray.h
include/mapnik/agg/agg_color_rgba.h
include/mapnik/agg/agg_config.h
include/mapnik/agg/agg_conv_adaptor_vcgen.h
include/mapnik/agg/agg_conv_adaptor_vpgen.h
include/mapnik/agg/agg_conv_bspline.h
include/mapnik/agg/agg_conv_clip_polygon.h
include/mapnik/agg/agg_conv_clip_polyline.h
include/mapnik/agg/agg_conv_clipper.h
include/mapnik/agg/agg_conv_close_polygon.h
include/mapnik/agg/agg_conv_concat.h
include/mapnik/agg/agg_conv_contour.h
include/mapnik/agg/agg_conv_curve.h
include/mapnik/agg/agg_conv_dash.h
include/mapnik/agg/agg_conv_gpc.h
include/mapnik/agg/agg_conv_marker.h
include/mapnik/agg/agg_conv_marker_adaptor.h
include/mapnik/agg/agg_conv_segmentator.h
include/mapnik/agg/agg_conv_shorten_path.h
include/mapnik/agg/agg_conv_smooth_poly1.h
include/mapnik/agg/agg_conv_stroke.h
include/mapnik/agg/agg_conv_transform.h
include/mapnik/agg/agg_conv_unclose_polygon.h
include/mapnik/agg/agg_curves.h
include/mapnik/agg/agg_dda_line.h
include/mapnik/agg/agg_ellipse.h
include/mapnik/agg/agg_ellipse_bresenham.h
include/mapnik/agg/agg_embedded_raster_fonts.h
include/mapnik/agg/agg_font_cache_manager.h
include/mapnik/agg/agg_gamma_functions.h
include/mapnik/agg/agg_gamma_lut.h
include/mapnik/agg/agg_glyph_raster_bin.h
include/mapnik/agg/agg_gradient_lut.h
include/mapnik/agg/agg_gsv_text.h
include/mapnik/agg/agg_image_accessors.h
include/mapnik/agg/agg_image_filters.h
include/mapnik/agg/agg_line_aa_basics.h
include/mapnik/agg/agg_math.h
include/mapnik/agg/agg_math_stroke.h
include/mapnik/agg/agg_path_length.h
include/mapnik/agg/agg_path_storage.h
include/mapnik/agg/agg_path_storage_integer.h
include/mapnik/agg/agg_pattern_filters_rgba.h
include/mapnik/agg/agg_pixfmt_amask_adaptor.h
include/mapnik/agg/agg_pixfmt_gray.h
include/mapnik/agg/agg_pixfmt_rgb.h
include/mapnik/agg/agg_pixfmt_rgb_packed.h
include/mapnik/agg/agg_pixfmt_rgba.h
include/mapnik/agg/agg_pixfmt_transposer.h
include/mapnik/agg/agg_rasterizer_cells_aa.h
include/mapnik/agg/agg_rasterizer_compound_aa.h
include/mapnik/agg/agg_rasterizer_outline.h
include/mapnik/agg/agg_rasterizer_outline_aa.h
include/mapnik/agg/agg_rasterizer_scanline_aa.h
include/mapnik/agg/agg_rasterizer_sl_clip.h
include/mapnik/agg/agg_renderer_base.h
include/mapnik/agg/agg_renderer_markers.h
include/mapnik/agg/agg_renderer_mclip.h
include/mapnik/agg/agg_renderer_outline_aa.h
include/mapnik/agg/agg_renderer_outline_image.h
include/mapnik/agg/agg_renderer_primitives.h
include/mapnik/agg/agg_renderer_raster_text.h
include/mapnik/agg/agg_renderer_scanline.h
include/mapnik/agg/agg_rendering_buffer.h
include/mapnik/agg/agg_rendering_buffer_dynarow.h
include/mapnik/agg/agg_rounded_rect.h
include/mapnik/agg/agg_scanline_bin.h
include/mapnik/agg/agg_scanline_boolean_algebra.h
include/mapnik/agg/agg_scanline_p.h
include/mapnik/agg/agg_scanline_storage_aa.h
include/mapnik/agg/agg_scanline_storage_bin.h
include/mapnik/agg/agg_scanline_u.h
include/mapnik/agg/agg_shorten_path.h
include/mapnik/agg/agg_simul_eq.h
include/mapnik/agg/agg_span_allocator.h
include/mapnik/agg/agg_span_converter.h
include/mapnik/agg/agg_span_gouraud.h
include/mapnik/agg/agg_span_gouraud_gray.h
include/mapnik/agg/agg_span_gouraud_rgba.h
include/mapnik/agg/agg_span_gradient.h
include/mapnik/agg/agg_span_gradient_alpha.h
include/mapnik/agg/agg_span_image_filter.h
include/mapnik/agg/agg_span_image_filter_gray.h
include/mapnik/agg/agg_span_image_filter_rgb.h
include/mapnik/agg/agg_span_image_filter_rgba.h
include/mapnik/agg/agg_span_interpolator_adaptor.h
include/mapnik/agg/agg_span_interpolator_linear.h
include/mapnik/agg/agg_span_interpolator_persp.h
include/mapnik/agg/agg_span_interpolator_trans.h
include/mapnik/agg/agg_span_pattern_gray.h
include/mapnik/agg/agg_span_pattern_rgb.h
include/mapnik/agg/agg_span_pattern_rgba.h
include/mapnik/agg/agg_span_solid.h
include/mapnik/agg/agg_span_subdiv_adaptor.h
include/mapnik/agg/agg_trans_affine.h
include/mapnik/agg/agg_trans_bilinear.h
include/mapnik/agg/agg_trans_double_path.h
include/mapnik/agg/agg_trans_lens.h
include/mapnik/agg/agg_trans_perspective.h
include/mapnik/agg/agg_trans_single_path.h
include/mapnik/agg/agg_trans_viewport.h
include/mapnik/agg/agg_trans_warp_magnifier.h
include/mapnik/agg/agg_vcgen_bspline.h
include/mapnik/agg/agg_vcgen_contour.h
include/mapnik/agg/agg_vcgen_dash.h
include/mapnik/agg/agg_vcgen_markers_term.h
include/mapnik/agg/agg_vcgen_smooth_poly1.h
include/mapnik/agg/agg_vcgen_stroke.h
include/mapnik/agg/agg_vcgen_vertex_sequence.h
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/clipper.hpp
include/mapnik/agg_helpers.hpp
include/mapnik/agg_pattern_source.hpp
include/mapnik/agg_rasterizer.hpp
include/mapnik/agg_renderer.hpp
include/mapnik/arrow.hpp
include/mapnik/attribute.hpp
include/mapnik/attribute_collector.hpp
include/mapnik/attribute_descriptor.hpp
include/mapnik/boolean.hpp
include/mapnik/box2d.hpp
include/mapnik/building_symbolizer.hpp
include/mapnik/cairo_context.hpp
include/mapnik/cairo_renderer.hpp
include/mapnik/char_info.hpp
include/mapnik/color.hpp
include/mapnik/color_factory.hpp
include/mapnik/config.hpp
@ -20,58 +150,84 @@ include/mapnik/config_error.hpp
include/mapnik/coord.hpp
include/mapnik/coord_array.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/css_color_grammar_deprecated.hpp
include/mapnik/css_color_grammar_impl.hpp
include/mapnik/ctrans.hpp
include/mapnik/datasource.hpp
include/mapnik/datasource_cache.hpp
include/mapnik/debug.hpp
include/mapnik/debug_symbolizer.hpp
include/mapnik/distance.hpp
include/mapnik/ellipsoid.hpp
include/mapnik/enumeration.hpp
include/mapnik/expression.hpp
include/mapnik/expression_evaluator.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/expression_grammar_impl.hpp
include/mapnik/expression_node.hpp
include/mapnik/expression_node_types.hpp
include/mapnik/expression_string.hpp
include/mapnik/factory.hpp
include/mapnik/fastmath.hpp
include/mapnik/feature.hpp
include/mapnik/feature_factory.hpp
include/mapnik/feature_kv_iterator.hpp
include/mapnik/feature_layer_desc.hpp
include/mapnik/feature_style_processor.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/feature_type_style.hpp
include/mapnik/fill.hpp
include/mapnik/filter_factory.hpp
include/mapnik/filter_featureset.hpp
include/mapnik/font_engine_freetype.hpp
include/mapnik/font_set.hpp
include/mapnik/gamma.hpp
include/mapnik/font_util.hpp
include/mapnik/formatting/
include/mapnik/formatting/base.hpp
include/mapnik/formatting/expression_format.hpp
include/mapnik/formatting/format.hpp
include/mapnik/formatting/list.hpp
include/mapnik/formatting/registry.hpp
include/mapnik/formatting/text.hpp
include/mapnik/gamma_method.hpp
include/mapnik/geom_util.hpp
include/mapnik/geometry.hpp
include/mapnik/global.hpp
include/mapnik/glyph_symbolizer.hpp
include/mapnik/gradient.hpp
include/mapnik/graphics.hpp
include/mapnik/grid/
include/mapnik/grid/grid.hpp
include/mapnik/grid/grid_marker_helpers.hpp
include/mapnik/grid/grid_pixel.hpp
include/mapnik/grid/grid_pixfmt.hpp
include/mapnik/grid/grid_rasterizer.hpp
include/mapnik/grid/grid_renderer.hpp
include/mapnik/grid/grid_renderer_base.hpp
include/mapnik/grid/grid_rendering_buffer.hpp
include/mapnik/grid/grid_util.hpp
include/mapnik/grid/grid_view.hpp
include/mapnik/hash_variant.hpp
include/mapnik/hextree.hpp
include/mapnik/hit_test_filter.hpp
include/mapnik/image_compositing.hpp
include/mapnik/image_data.hpp
include/mapnik/image_filter.hpp
include/mapnik/image_filter_grammar.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_reader.hpp
include/mapnik/image_scaling.hpp
include/mapnik/image_util.hpp
include/mapnik/image_view.hpp
include/mapnik/jpeg_io.hpp
include/mapnik/json/
include/mapnik/json/feature_collection_grammar.hpp
include/mapnik/json/feature_collection_parser.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_grammar.hpp
include/mapnik/json/geojson_generator.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/json/geometry_parser.hpp
include/mapnik/label_collision_detector.hpp
include/mapnik/label_placement.hpp
include/mapnik/layer.hpp
include/mapnik/libxml2_loader.hpp
include/mapnik/line_pattern_symbolizer.hpp
include/mapnik/line_symbolizer.hpp
include/mapnik/load_map.hpp
@ -79,27 +235,33 @@ include/mapnik/map.hpp
include/mapnik/mapped_memory_cache.hpp
include/mapnik/marker.hpp
include/mapnik/marker_cache.hpp
include/mapnik/marker_helpers.hpp
include/mapnik/markers_placement.hpp
include/mapnik/markers_symbolizer.hpp
include/mapnik/memory.hpp
include/mapnik/memory_datasource.hpp
include/mapnik/memory_featureset.hpp
include/mapnik/metawriter.hpp
include/mapnik/metawriter_factory.hpp
include/mapnik/metawriter_inmem.hpp
include/mapnik/metawriter_json.hpp
include/mapnik/miniz_png.hpp
include/mapnik/noncopyable.hpp
include/mapnik/octree.hpp
include/mapnik/offset_converter.hpp
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_expression.hpp
include/mapnik/path_expression_grammar.hpp
include/mapnik/pixel_position.hpp
include/mapnik/placement_finder.hpp
include/mapnik/plugin.hpp
include/mapnik/png_io.hpp
include/mapnik/point_symbolizer.hpp
include/mapnik/polygon_clipper.hpp
include/mapnik/polygon_pattern_symbolizer.hpp
include/mapnik/polygon_symbolizer.hpp
include/mapnik/pool.hpp
include/mapnik/processed_text.hpp
include/mapnik/proj_transform.hpp
include/mapnik/projection.hpp
include/mapnik/ptree_helpers.hpp
@ -108,50 +270,90 @@ include/mapnik/query.hpp
include/mapnik/raster.hpp
include/mapnik/raster_colorizer.hpp
include/mapnik/raster_symbolizer.hpp
include/mapnik/request.hpp
include/mapnik/rule.hpp
include/mapnik/rule_cache.hpp
include/mapnik/save_map.hpp
include/mapnik/scale_denominator.hpp
include/mapnik/segment.hpp
include/mapnik/shield_symbolizer.hpp
include/mapnik/simplify.hpp
include/mapnik/simplify_converter.hpp
include/mapnik/span_image_filter.hpp
include/mapnik/sparsehash/
include/mapnik/sparsehash/dense_hash_map
include/mapnik/sparsehash/internal/
include/mapnik/sparsehash/internal/densehashtable.h
include/mapnik/sparsehash/internal/hashtable-common.h
include/mapnik/sparsehash/internal/libc_allocator_with_realloc.h
include/mapnik/sparsehash/internal/sparseconfig.h
include/mapnik/sparsehash/template_util.h
include/mapnik/sparsehash/type_traits.h
include/mapnik/sql_utils.hpp
include/mapnik/stroke.hpp
include/mapnik/style_factory.hpp
include/mapnik/svg/
include/mapnik/svg/svg_converter.hpp
include/mapnik/svg/svg_generator.hpp
include/mapnik/svg/svg_output_attributes.hpp
include/mapnik/svg/svg_output_grammars.hpp
include/mapnik/svg/svg_parser.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_iterator.hpp
include/mapnik/svg/svg_path_parser.hpp
include/mapnik/svg/svg_points_grammar.hpp
include/mapnik/svg/svg_renderer.hpp
include/mapnik/svg/svg_renderer_agg.hpp
include/mapnik/svg/svg_storage.hpp
include/mapnik/svg/svg_transform_grammar.hpp
include/mapnik/svg_renderer.hpp
include/mapnik/symbolizer.hpp
include/mapnik/symbolizer_hash.hpp
include/mapnik/symbolizer_helpers.hpp
include/mapnik/text_path.hpp
include/mapnik/text_placements.hpp
include/mapnik/text_placements_simple.hpp
include/mapnik/text_placements/
include/mapnik/text_placements/base.hpp
include/mapnik/text_placements/dummy.hpp
include/mapnik/text_placements/list.hpp
include/mapnik/text_placements/registry.hpp
include/mapnik/text_placements/simple.hpp
include/mapnik/text_properties.hpp
include/mapnik/text_symbolizer.hpp
include/mapnik/tiff_io.hpp
include/mapnik/timer.hpp
include/mapnik/transform_expression.hpp
include/mapnik/transform_expression_grammar.hpp
include/mapnik/transform_processor.hpp
include/mapnik/unicode.hpp
include/mapnik/util/
include/mapnik/util/container_adapter.hpp
include/mapnik/util/conversions.hpp
include/mapnik/util/dasharray_parser.hpp
include/mapnik/util/deepcopy.hpp
include/mapnik/util/fs.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_to_ds_type.hpp
include/mapnik/util/geometry_to_svg.hpp
include/mapnik/util/geometry_to_wkb.hpp
include/mapnik/util/geometry_to_wkt.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/util/hsl.hpp
include/mapnik/util/path_iterator.hpp
include/mapnik/util/trim.hpp
include/mapnik/utils.hpp
include/mapnik/value.hpp
include/mapnik/value_error.hpp
include/mapnik/value_types.hpp
include/mapnik/version.hpp
include/mapnik/vertex.hpp
include/mapnik/vertex_transform.hpp
include/mapnik/vertex_converters.hpp
include/mapnik/vertex_vector.hpp
include/mapnik/warp.hpp
include/mapnik/well_known_srs.hpp
include/mapnik/wkb.hpp
include/mapnik/wkt/
include/mapnik/wkt/wkt_factory.hpp
include/mapnik/wkt/wkt_grammar.hpp
include/mapnik/xml_attribute_cast.hpp
include/mapnik/xml_loader.hpp
include/mapnik/xml_node.hpp
include/mapnik/xml_tree.hpp
@lib lib/libmapnik.so.${LIBmapnik_VERSION}
lib/mapnik/
lib/mapnik/input/