[patch] patch according to upstream commit bcb1e675075c64cb2c398de5013306b2b9cd47ce

file_691130.txt (text/plain), 2.12 KB, created by Peter Serbe on 2019-11-10 12:18:45 UTC

diff -urN a/deps/agg/src/agg_pixfmt_rgba.cpp b/deps/agg/src/agg_pixfmt_rgba.cpp
--- a/deps/agg/src/agg_pixfmt_rgba.cpp  2019-11-10 12:35:59.623304514 +0100
+++ b/deps/agg/src/agg_pixfmt_rgba.cpp  2019-11-10 12:36:06.472304753 +0100
@@ -3,7 +3,13 @@

 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 106900
+#include <boost/gil.hpp>
+#else
 #include <boost/gil/gil_all.hpp>
+#include <boost/gil/gil_all.hpp>
+#endif
 #include <boost/gil/extension/toolbox/hsv.hpp>
 #include <boost/gil/extension/toolbox/hsl.hpp>
 #pragma GCC diagnostic pop
diff -urN a/deps/boost/gil/extension/toolbox/hsl.hpp b/deps/boost/gil/extension/toolbox/hsl.hpp
--- a/deps/boost/gil/extension/toolbox/hsl.hpp  2019-11-10 12:35:59.623304514 +0100
+++ b/deps/boost/gil/extension/toolbox/hsl.hpp  2019-11-10 12:36:06.473304753 +0100
@@ -16,7 +16,12 @@

 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
+#if BOOST_VERSION >= 106900
+#include <boost/gil.hpp>
+#else
 #include <boost/gil/gil_all.hpp>
+#endif
+
 #pragma GCC diagnostic pop

 namespace boost { namespace gil {
diff -urN a/deps/boost/gil/extension/toolbox/hsv.hpp b/deps/boost/gil/extension/toolbox/hsv.hpp
--- a/deps/boost/gil/extension/toolbox/hsv.hpp  2019-11-10 12:35:59.623304514 +0100
+++ b/deps/boost/gil/extension/toolbox/hsv.hpp  2019-11-10 12:36:06.473304753 +0100
@@ -16,7 +16,12 @@

 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
+#if BOOST_VERSION >= 106900
+#include <boost/gil.hpp>
+#else
 #include <boost/gil/gil_all.hpp>
+#endif
+
 #pragma GCC diagnostic pop

 namespace boost { namespace gil {
diff -urN a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp
--- a/include/mapnik/image_filter.hpp   2019-11-10 12:35:59.635304514 +0100
+++ b/include/mapnik/image_filter.hpp   2019-11-10 12:36:06.483304754 +0100
@@ -31,7 +31,11 @@

 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
+#if BOOST_VERSION >= 106900
+#include <boost/gil.hpp>
+#else
 #include <boost/gil/gil_all.hpp>
+#endif
 #pragma GCC diagnostic pop

 // agg