SHA256
1
0
forked from pool/aegisub
2020-04-30 07:26:24 +00:00
committed by Git OBS Bridge
parent e83e36e789
commit bae05bcc82
4 changed files with 118 additions and 0 deletions

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d18be11ff7ec128b86316d6a9fa015a176b1a0b92bf3fd886f5f501d00d6a7f1
size 7473463

View File

@@ -0,0 +1,25 @@
From 7479ffbd6d9cc9bf9786d1f1d9f0e6307198681f Mon Sep 17 00:00:00 2001
From: Martin Herkt <lachs0r@srsfckn.biz>
Date: Thu, 14 Feb 2019 14:52:27 +0100
Subject: [PATCH] DataBlockCache: Fix crash in cache invalidation
Fixes #33
---
src/block_cache.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/block_cache.h 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h 2019-03-29 13:17:48.209456221 +0200
@@ -150,8 +150,8 @@ public:
}
// Remove old entries until we're under the max size
- for (auto it = age.rbegin(); size > max_size && it != age.rend(); )
- KillMacroBlock(**it++);
+ for (auto it = age.rbegin(); size > max_size && it != age.rend(); it++)
+ KillMacroBlock(**it);
}
/// @brief Obtain a data block from the cache

82
aegisub-boost169.patch Normal file
View File

@@ -0,0 +1,82 @@
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/colour_button.cpp 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp 2019-03-29 13:05:42.776195551 +0200
@@ -18,8 +18,16 @@
#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);
ColourButton::ColourButton(wxWindow *parent, wxSize const& size, bool alpha, agi::Color col, wxValidator const& validator)
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_provider_dummy.cpp 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp 2019-03-29 13:07:20.480135858 +0200
@@ -45,8 +45,16 @@
#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)
, fps(fps)
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_frame.cpp 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp 2019-03-29 13:08:04.509911568 +0200
@@ -16,7 +16,15 @@
#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 {
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/subtitles_provider_libass.cpp 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp 2019-03-29 13:08:57.240038186 +0200
@@ -46,7 +46,15 @@
#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>

View File

@@ -0,0 +1,8 @@
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h 2019-03-29 13:17:45.073329657 +0200
@@ -0,0 +1,3 @@
+#define BUILD_GIT_VERSION_NUMBER 83736
+#define BUILD_GIT_VERSION_STRING "3.2.2+git20180710"
+#define TAGGED_RELEASE 0