summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <sarnex@gentoo.org>2019-07-11 21:36:13 -0400
committerNick Sarnie <sarnex@gentoo.org>2019-07-11 21:43:15 -0400
commit01c90376343b3883da48f42accbbf0a6de4193e2 (patch)
treed4b328a589061b83571c7d6caa82e5f1e0733188 /media-video/aegisub/files
parentdev-python/google-auth-httplib2: Version bump to 0.0.3 (diff)
downloadgentoo-01c90376343b3883da48f42accbbf0a6de4193e2.tar.gz
gentoo-01c90376343b3883da48f42accbbf0a6de4193e2.tar.bz2
gentoo-01c90376343b3883da48f42accbbf0a6de4193e2.zip
media-video/aegisub: Fix build against boost 1.70.0
Patch from: Damien Thébault <damien.thebault@gmail.com> Fixes: https://bugs.gentoo.org/689196 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
Diffstat (limited to 'media-video/aegisub/files')
-rw-r--r--media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch
new file mode 100644
index 000000000000..30473e4828d1
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch
@@ -0,0 +1,61 @@
+diff a/src/colour_button.cpp b/src/colour_button.cpp
+--- 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
+
+ AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
+
+diff a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
+--- 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 >= 106900
++#include <boost/gil.hpp>
++#else
+ #include <boost/gil/gil_all.hpp>
++#endif
+ #include <memory>
+ #include <mutex>
+
+diff a/src/video_frame.cpp b/src/video_frame.cpp
+--- 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 a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
+--- 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 >= 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)
+