diff options
| author | scx <scx.mail@gmail.com> | 2019-09-07 20:55:07 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2022-07-20 16:13:45 +0200 |
| commit | 23052682015b681de6408a2feee64d80a7944754 (patch) | |
| tree | a2bc560e669c5e8204c4dc4a37e3e9badea089e8 | |
| parent | ce0f939e77638678c186c64dee98a117d7c79f96 (diff) | |
[PATCH] Fixes for Boost 1.69.0
===================================================================
Gbp-Pq: Name fix-compilation-with-Boost-1.71.patch
| -rw-r--r-- | src/colour_button.cpp | 4 | ||||
| -rw-r--r-- | src/subtitles_provider_libass.cpp | 4 | ||||
| -rw-r--r-- | src/video_frame.cpp | 4 | ||||
| -rw-r--r-- | src/video_provider_dummy.cpp | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/colour_button.cpp b/src/colour_button.cpp index f985e62..a0a7a6f 100644 --- a/src/colour_button.cpp +++ b/src/colour_button.cpp @@ -18,7 +18,11 @@ #include "dialogs.h" +#if BOOST_VERSION >= 106900 +#include <boost/gil.hpp> +#else #include <boost/gil/gil_all.hpp> +#endif wxDEFINE_EVENT(EVT_COLOR, wxThreadEvent); diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp index 3dc047e..c952eac 100644 --- a/src/subtitles_provider_libass.cpp +++ b/src/subtitles_provider_libass.cpp @@ -50,7 +50,11 @@ #include <libaegisub/util.h> #include <atomic> +#if BOOST_VERSION >= 106900 +#include <boost/gil.hpp> +#else #include <boost/gil/gil_all.hpp> +#endif #include <memory> #include <mutex> diff --git a/src/video_frame.cpp b/src/video_frame.cpp index 6100058..c7957d9 100644 --- a/src/video_frame.cpp +++ b/src/video_frame.cpp @@ -16,7 +16,11 @@ #include "video_frame.h" +#if BOOST_VERSION >= 106900 +#include <boost/gil.hpp> +#else #include <boost/gil/gil_all.hpp> +#endif #include <wx/image.h> namespace { diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp index 39eb69e..5cfea3f 100644 --- a/src/video_provider_dummy.cpp +++ b/src/video_provider_dummy.cpp @@ -46,7 +46,11 @@ #include <boost/algorithm/string/split.hpp> #include <boost/filesystem/path.hpp> #include <libaegisub/format.h> +#if BOOST_VERSION >= 106900 +#include <boost/gil.hpp> +#else #include <boost/gil/gil_all.hpp> +#endif DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern) : framecount(frames) |