From 32fc7abd2dde29654c7e2ed9b276c43f0ac7497d Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Wed, 27 Jul 2022 17:06:32 +0200 Subject: [PATCH 1/3] Explain the problems with adding new forks --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ac3e276b..1f7100489 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Go [here](#branchfeature-list) for the new features. ### Don't we have enough Aegisub forks already?? -We absolutely do, and I'm aware that adding another one doesn't sound like a good idea on paper. However, +We absolutely do, and I'm aware that adding another one [doesn't sound like a good idea on paper](https://xkcd.com/927/). However, - None of the existing forks are completely satisfying at the moment: - [wangqr's fork](https://github.com/wangqr/Aegisub) is actively maintained, but focussing more on stability. It's missing most of the modern features. From 9177943c7641fe6596ce138bdd20c8f861ad4bf1 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Sat, 30 Jul 2022 01:51:46 +0200 Subject: [PATCH 2/3] Update README: ffms2 and misc_dc --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1f7100489..6dee04ee9 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ The `cibuilds` branch makes some CI builds of snapshots of `feature` at relevant - [`color_picker_fix2`](https://github.com/arch1t3cht/Aegisub/tree/color_picker_fix2): Add an option (under "Interface") to restrict the color picker to the window, which fixes the color picker on Linux in a lot of cases. - [`avisynth`](https://github.com/arch1t3cht/Aegisub/tree/avisynth): Reenable Avisynth support on Windows (Still occasionally crashes) - [`bugfixes`](https://github.com/arch1t3cht/Aegisub/tree/bugfixes): Various fixes, mostly relevant for compilation +- [`mix_dc`](https://github.com/arch1t3cht/Aegisub/tree/misc_dc): Miscellaneous changes taken from AegisubDC - [`video_panning_feature`](https://github.com/arch1t3cht/Aegisub/tree/video_panning_feature): Merge [moex3's video zoom and panning](https://github.com/TypesettingTools/Aegisub/pull/150), with an OSX fix and an option to toggle the behavior of Ctrl+Zoom - [`spectrum-frequency-mapping`](https://github.com/arch1t3cht/Aegisub/tree/spectrum-frequency-mapping): Merge EleonoreMizo's [spectrum display improvements](https://github.com/TypesettingTools/Aegisub/pull/94), and also make Shift+Scroll vertically zoom the audio display @@ -39,6 +40,9 @@ The exact way of switching depends on your Linux distribution, but essentially y #### I get errors like "Option not found" after merging one of these branches The changes to `default_config.json` or similar files weren't detected by meson due to missing regen dependencies. You can either merge the `bugfixes` branch or rebuild from scratch. +#### The video is desynced / Frames don't appear at the right time +This is probably due to the ffms2 seeking bug ([#394](https://github.com/FFMS/ffms2/issues/394)). On Windows, this shouldn't happen anymore. On Linux, you need to install the latest git version of ffms2 - for example the [`ffms2-git`](https://aur.archlinux.org/packages/ffms2-git) AUR package on Arch linux, or just compile it yourself. + # Aegisub From a37f84215df6aca32b3e8491adddf1142d4cfef9 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Sat, 30 Jul 2022 03:36:33 +0200 Subject: [PATCH 3/3] Typo fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6dee04ee9..618fe9867 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The `cibuilds` branch makes some CI builds of snapshots of `feature` at relevant - [`color_picker_fix2`](https://github.com/arch1t3cht/Aegisub/tree/color_picker_fix2): Add an option (under "Interface") to restrict the color picker to the window, which fixes the color picker on Linux in a lot of cases. - [`avisynth`](https://github.com/arch1t3cht/Aegisub/tree/avisynth): Reenable Avisynth support on Windows (Still occasionally crashes) - [`bugfixes`](https://github.com/arch1t3cht/Aegisub/tree/bugfixes): Various fixes, mostly relevant for compilation -- [`mix_dc`](https://github.com/arch1t3cht/Aegisub/tree/misc_dc): Miscellaneous changes taken from AegisubDC +- [`misc_dc`](https://github.com/arch1t3cht/Aegisub/tree/misc_dc): Miscellaneous changes taken from AegisubDC - [`video_panning_feature`](https://github.com/arch1t3cht/Aegisub/tree/video_panning_feature): Merge [moex3's video zoom and panning](https://github.com/TypesettingTools/Aegisub/pull/150), with an OSX fix and an option to toggle the behavior of Ctrl+Zoom - [`spectrum-frequency-mapping`](https://github.com/arch1t3cht/Aegisub/tree/spectrum-frequency-mapping): Merge EleonoreMizo's [spectrum display improvements](https://github.com/TypesettingTools/Aegisub/pull/94), and also make Shift+Scroll vertically zoom the audio display