Merge branch 'master' of github.com:mapnik/mapnik into expr-v2

Conflicts:
	tests/cpp_tests/svg_renderer_tests/path_element_test.cpp

include/mapnik/vertex_converters.hpp

@@ -38,7 +38,6 @@
 // fusion
 #include <boost/fusion/include/at_c.hpp>
 #include <boost/fusion/container/vector.hpp>
-#include <boost/array.hpp>
 
 // mapnik
 #include <mapnik/agg_helpers.hpp>
@@ -59,6 +58,7 @@
 
 // stl
 #include <stdexcept>
+#include <array>
 
 namespace mapnik {
 
@@ -323,7 +323,7 @@ struct dispatcher
         dispatch<begin,end,Geometry>(geom, boost::false_type());
     }
 
-    boost::array<unsigned, boost::mpl::size<conv_types>::value> vec_;
+    std::array<unsigned, boost::mpl::size<conv_types>::value> vec_;
     args_type args_;
 };
 }

src/build.py

@@ -52,22 +52,31 @@ libmapnik_defines = copy(lib_env['CPPDEFINES'])
 
 ABI_VERSION = env['ABI_VERSION']
 
+enabled_imaging_libraries = []
 filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
 regex = 'boost_regex%s' % env['BOOST_APPEND']
 system = 'boost_system%s' % env['BOOST_APPEND']
 
 # clear out and re-set libs for this env
-lib_env['LIBS'] = ['freetype',env['ICU_LIB_NAME'],filesystem,system,regex,'harfbuzz', 'harfbuzz-icu']
+# note: order matters on linux: see lorder | tsort
+lib_env['LIBS'] = [filesystem,regex]
 
-if '-DMAPNIK_USE_PROJ4' in env['CPPDEFINES']:
+if env['HAS_CAIRO']:
-   lib_env['LIBS'].append('proj')
+    lib_env.Append(LIBS=env['CAIRO_ALL_LIBS'])
 
-enabled_imaging_libraries = []
+# maybe bz2
+if len(env['EXTRA_FREETYPE_LIBS']):
+    lib_env['LIBS'].extend(copy(env['EXTRA_FREETYPE_LIBS']))
+
+lib_env['LIBS'].append('harfbuzz-icu')
 
 if '-DHAVE_PNG' in env['CPPDEFINES']:
    lib_env['LIBS'].append('png')
    enabled_imaging_libraries.append('png_reader.cpp')
 
+if '-DMAPNIK_USE_PROJ4' in env['CPPDEFINES']:
+   lib_env['LIBS'].append('proj')
+
 if '-DHAVE_TIFF' in env['CPPDEFINES']:
    lib_env['LIBS'].append('tiff')
    enabled_imaging_libraries.append('tiff_reader.cpp')
@@ -76,25 +85,34 @@ if '-DHAVE_WEBP' in env['CPPDEFINES']:
    lib_env['LIBS'].append('webp')
    enabled_imaging_libraries.append('webp_reader.cpp')
 
-if '-DHAVE_JPEG' in env['CPPDEFINES']:
-   lib_env['LIBS'].append('jpeg')
-   enabled_imaging_libraries.append('jpeg_reader.cpp')
-
-if len(env['EXTRA_FREETYPE_LIBS']):
-    lib_env['LIBS'].extend(copy(env['EXTRA_FREETYPE_LIBS']))
-
 lib_env['LIBS'].append('xml2')
-lib_env['LIBS'].append('z')
 
 if '-DBOOST_REGEX_HAS_ICU' in env['CPPDEFINES']:
     lib_env['LIBS'].append('icui18n')
 
+lib_env['LIBS'].append(system)
+
+lib_env['LIBS'].append('harfbuzz')
+
+if '-DHAVE_JPEG' in env['CPPDEFINES']:
+   lib_env['LIBS'].append('jpeg')
+   enabled_imaging_libraries.append('jpeg_reader.cpp')
+
+lib_env['LIBS'].append(env['ICU_LIB_NAME'])
+
+lib_env['LIBS'].append('freetype')
+
 if env['RUNTIME_LINK'] == 'static':
+    if env['PLATFORM'] == 'Linux':
+        lib_env['LINKFLAGS'].append('-pthread')
     if 'icuuc' in env['ICU_LIB_NAME']:
         lib_env['LIBS'].append('icudata')
-else:
+
+if env['RUNTIME_LINK'] != 'static':
     lib_env['LIBS'].insert(0, 'agg')
 
+lib_env['LIBS'].append('z')
+
 if env['PLATFORM'] == 'Darwin':
     mapnik_libname = env.subst(env['MAPNIK_LIB_NAME'])
     if env['FULL_LIB_PATH']:
@@ -256,7 +274,6 @@ if env['PLUGIN_LINKING'] == 'static':
 
 if env['HAS_CAIRO']:
     lib_env.AppendUnique(LIBPATH=env['CAIRO_LIBPATHS'])
-    lib_env.Append(LIBS=env['CAIRO_ALL_LIBS'])
     lib_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
     libmapnik_defines.append('-DHAVE_CAIRO')
     lib_env.AppendUnique(CPPPATH=copy(env['CAIRO_CPPPATHS']))

tests/cpp_tests/svg_renderer_tests/path_element_test.cpp

@@ -204,8 +204,8 @@ void prepare_map(Map & m)
 
         layer lyr("Provinces");
         lyr.set_datasource(datasource_cache::instance().create(p));
-        lyr.add_style("provinces");
         lyr.set_srs(srs_lcc);
+        lyr.add_style("provinces");
         m.add_layer(lyr);
     }
 
@@ -260,6 +260,7 @@ void prepare_map(Map & m)
 
         m.add_layer(lyr);
     }
+
     // popplaces
     {
         parameters p;