Integrate changes from 2.6 RC2

[qyot27]

I noticed earlier this morning that RC2 had been released a few days ago, so I did the same thing I did for RC1 and looked at what needed to be merged. The answer is a very underwhelming 'almost nothing', because most of the 14 commits that make up RC2 touch parts that have been removed from AviSynth+ entirely.

HTML        0001-corrections.patch
HTML        0003-Fix-No-newline-at-end-of-file.patch
HTML        0013-Use-env-Invoke-ConvertAudio-.-in-example.patch

applies-1   0002-one-instance-of-color_palegoldenrod-removed.patch
applies-2   0006-Add-I420-to-message.patch

rejected-1  0007-Remove-AlignPlanar.patch
rejected-2  0008-Release-candicate-2.patch
rejected-3  0009-Support-2.6-colour-spaces.-Wilbert.patch
rejected-4  0010-Remove-AlignPlanar.patch
rejected-5  0011-Change-default-install-dir-to-PROGRAMFILES-AviSynth-.patch
rejected-6  0014-Change-www.avisynth.org-to-www.avisynth.nl.patch
rejected-7  0004-Release-candicate-2.patch
rejected-8  0005-Bump-version-for-extended-cache-requests.patch
rejected-9  0012-Release-candicate-2.patch

HTML        Changes to the HTML documentation; irrelevant in normal form since avsplus uses
        reStructuredText+Sphinx, but the content can be migrated.  The one about newlines
        at end of files is irrelevant unless some other change is in there too.

        Since all three of these commits go into the FilterSDK and there's still an HTML
        copy of the FilterSDK in the avsplus source, these get applied twice: once as HTML,
        and then the content is migrated over to RST. No real need to have three discrete
        commits for the RST version, so they're all going in in one commit.

rejected-1-4    avsplus doesn't have TCPDeliver in its source tree, it uses the DLL from classic's distro

rejected-5  NSI script is irrelevant to avsplus, and avsplus uses a different directory name anyway

rejected-6  Already changed in avsplus during the version refactoring.

rejected-7  All changes to either TCPDeliver (doesn't exist in avsplus source tree) or to .rc files
        making it register with a bumped '2,6,0,x' version, which avsplus no longer identifies as

rejected-8  avsplus cache refactoring made this irrelevant

rejected-9  It looks like it's just a straight copy of the new avisynth.h into DSS' plugin sources,
        replacing the old one.  avsplus made this irrelevant, probably long long ago, by making
        DSS refer to the avisynth.h in include/, not one in its own sources.

applies-1   Applies cleanly, but needs the path changed from distrib/color_presets to distrib/ColorPresets

applies-2   Applies cleanly, but needs the path to be changed from src/plugins/DirectShowSource to plugins/DirectShowSource

What made this more fun is that jeeb hasn't mirrored these commits yet (so the modifications to the RC2 commits and cherry-picking can't currently be forced over the old theirs history). With this in mind, #22 and this quirk could be solved by having a classic_avisynth branch where we can pull in CVS changes ourselves if we have to. I have such a branch pushed onto my repo.

[pylorak]

Hmmm... JEEB still hasn't mirrored the changes. Is there any indication he won't, or is he just slacking? Technically we don't need his branch and we could just mirror CVS in a branch of our own as you say, but if possible I'd like to avoid duplicating the whole history of Avisynth a 3rd time.

[qyot27]

I honestly don't know. The readme.md in the blitzkrieg branch has the exact command to perform it, and it can be done from the existing branch HEAD. The only thing the command is missing is the branch the changes should be merged into (so just append '-o target-branch' onto the end).

I fetched JEEB's mirror into the 'classic_avisynth' branch on my repo, and since I wanted to keep things clean just in case he does update again, spawned off a 'classic_26rc2' branch where I used the command from readme.md to pull in the changes, and then did the migration work from there (and last night, pulled in the two RC3-related commits...neither of which are relevant to avsplus).

[qyot27]

Preliminarily, I've cherry-picked the only change that occurred between RC2/RC3 and 2.6 Final: the restoration of the GPL exception clause in avisynth.h. With this, we're caught up to 2.6.0 Final.

If, however, it gets determined that we cannot do that to avisynth.h on our side because of the avsplus-specific changes that occurred based on the old exception-less alpha header, that commit can be omitted before merging.

[qyot27]

There's also been no movement on jeeb's repo over the past month and a half since I opened this PR, so I think we should mirror it ourselves.

[myrsloik]

The JEEB has updated it now

[pylorak]

I'll merge from JEEB then. Thx for the heads up.