Date: Mon, 22 Oct 2018 20:29:03 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482784 - head/multimedia/aegisub/files Message-ID: <201810222029.w9MKT3mk097531@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Oct 22 20:29:03 2018 New Revision: 482784 URL: https://svnweb.freebsd.org/changeset/ports/482784 Log: multimedia/aegisub: unbreak with boost 1.69 src/colour_button.cpp:21:10: fatal error: 'boost/gil/gil_all.hpp' file not found #include <boost/gil/gil_all.hpp> ^~~~~~~~~~~~~~~~~~~~~~~ PR: 232525 Added: head/multimedia/aegisub/files/patch-boost-1.69 (contents, props changed) Added: head/multimedia/aegisub/files/patch-boost-1.69 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/aegisub/files/patch-boost-1.69 Mon Oct 22 20:29:03 2018 (r482784) @@ -0,0 +1,62 @@ +https://github.com/Aegisub/Aegisub/issues/93 + +--- src/colour_button.cpp.orig 2014-12-08 00:07:09 UTC ++++ src/colour_button.cpp +@@ -18,7 +18,12 @@ + + #include "dialogs.h" + ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + + wxDEFINE_EVENT(EVT_COLOR, wxThreadEvent); + +--- src/subtitles_provider_libass.cpp.orig 2014-12-08 00:07:09 UTC ++++ src/subtitles_provider_libass.cpp +@@ -50,7 +50,12 @@ + #include <libaegisub/util.h> + + #include <atomic> ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + #include <memory> + #include <mutex> + +--- src/video_frame.cpp.orig 2014-12-08 00:07:09 UTC ++++ src/video_frame.cpp +@@ -16,7 +16,12 @@ + + #include "video_frame.h" + ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + #include <wx/image.h> + + namespace { +--- src/video_provider_dummy.cpp.orig 2014-12-08 00:07:09 UTC ++++ src/video_provider_dummy.cpp +@@ -46,7 +46,12 @@ + #include <boost/algorithm/string/split.hpp> + #include <boost/filesystem/path.hpp> + #include <libaegisub/format.h> ++#include <boost/version.hpp> ++#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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810222029.w9MKT3mk097531>