From 75fc5f38d79ac2a776f6ccc452a8b7b3cd85c397 Mon Sep 17 00:00:00 2001
From: FichteFoll <fichtefoll2@googlemail.com>
Date: Fri, 1 Feb 2019 00:14:14 +0100
Subject: [PATCH] Adjust boost gil header paths for boost 1.69

boost/gil.hpp was added in 1.68 and boost/gil/gil_all.hpp removed in
1.69.
---
 src/colour_button.cpp             | 4 ++++
 src/subtitles_provider_libass.cpp | 4 ++++
 src/video_frame.cpp               | 4 ++++
 src/video_provider_dummy.cpp      | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/src/colour_button.cpp b/src/colour_button.cpp
index c0b1c5d58..f7ff956b4 100644
--- a/src/colour_button.cpp
+++ b/src/colour_button.cpp
@@ -18,7 +18,11 @@
 
 #include "dialogs.h"
 
+#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
 #include <boost/gil/gil_all.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 
 AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
 
diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
index efb5cb481..f424c0177 100644
--- a/src/subtitles_provider_libass.cpp
+++ b/src/subtitles_provider_libass.cpp
@@ -46,7 +46,11 @@
 #include <libaegisub/util.h>
 
 #include <atomic>
+#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
 #include <boost/gil/gil_all.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 #include <memory>
 #include <mutex>
 
diff --git a/src/video_frame.cpp b/src/video_frame.cpp
index 610005879..9f22f5063 100644
--- a/src/video_frame.cpp
+++ b/src/video_frame.cpp
@@ -16,7 +16,11 @@
 
 #include "video_frame.h"
 
+#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
 #include <boost/gil/gil_all.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 #include <wx/image.h>
 
 namespace {
diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
index b68b206b7..da3b4a0a4 100644
--- a/src/video_provider_dummy.cpp
+++ b/src/video_provider_dummy.cpp
@@ -45,7 +45,11 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem/path.hpp>
 #include <libaegisub/format.h>
+#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
 #include <boost/gil/gil_all.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 
 DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
 : framecount(frames)