James-F wrote:Thanks Yesterplay80!
Since some patches interfere with others because they change the same files and sometimes even the same lines, I came up with a single patch file, if anyone's interested, this is it:
What did you do to avoid conflict, in case I encounter the same problem?
Exactly, Dominus! 😀 While there are tools, like combinediff for example, that can combine several diff files into one, they stop working the moment one patch adds or deletes lines from a file, which is the case here. So that's what I did:
I started (of course) with a fresh checkout of the repository and added the NukedOPL patch. I then applied the 3Dfx patch, checking which hunks failed to patch and fixing the diff file manually so it would apply upon the changes the NukedOPL already made. After that I copied the modified dosbox source folder, checked out a fresh SVN and then made a diff file comparing both folders, ending up with a patch that combined the NukedOPL and the 3Dfx patch. I applied the combined patch to the fresh SVN to see if it worked, which it did.
Next I applied the pixel perfect patch, again fixing the parts of the diff that would not work because of the changes the earlier patch already made. Comparing the patched source with another freshly checked out source resulted in a diff including all 3 patches, which applied just fine to the fresh SVN.
Then I repeated the steps from before: I tried to apply the scalers patch, fixed the parts in the diff that didn't work (this time it was just some wrong lines), succesfully applied it again and the copied away the patched source folder containing all 4 patches. The last diff I created by comparing that with a fresh source finally resulted in the diff you see here, containing all 4 patches.
My full-featured DOSBox SVN builds for Windows & Linux: Vanilla DOSBox and DOSBox ECE (Google Drive Mirror)