Partial merge of rb 2.5

[devernay]

There are conflicts when merging RB-2.5into RB-2.6, so I could not do a full merge.
This is just a cherrypick of some of the 18 commits, but those related to:

1. github actions
2. cmake
3. windows packages

were not merged. Here's the full list of missing commits:

• 7ddcfe8 @rodlie
• d1c2659 @rodlie
• 1fe5e52 reviewed by @acolwell
• c7767b1 @acolwell
• cc47b65 @acolwell
• fddb2e7 @acolwell
• 2d14d4e @acolwell

@acolwell or @rodlie could you check what needs to be merged and do a full merge of RB-2.5 into RB-2.6? We should always merge changes from RB-2.x into RB-2.y if x < y, so that RB-2.y is fully ahead of RB-2.x. Hopefully this will not be an issue anymore now that RB-2.6 is the default branch.

[acolwell]

There are conflicts when merging RB-2.5into RB-2.6, so I could not do a full merge. This is just a cherrypick of some of the 18 commits, but those related to:

1. github actions
2. cmake
3. windows packages

were not merged. Here's the full list of missing commits:

• 7ddcfe8 @rodlie
• d1c2659 @rodlie
• 1fe5e52 reviewed by @acolwell
• c7767b1 @acolwell
• cc47b65 @acolwell
• fddb2e7 @acolwell
• 2d14d4e @acolwell

@acolwell or @rodlie could you check what needs to be merged and do a full merge of RB-2.5 into RB-2.6? We should always merge changes from RB-2.x into RB-2.y if x < y, so that RB-2.y is fully ahead of RB-2.x. Hopefully this will not be an issue anymore now that RB-2.6 is the default branch.

I merged everything from 2.5 to 2.6 before I requested 2.6 become the default branch. (#977) I believe your MacPorts change and RotoPaint fix are the only things that actually need to be merged.

[rodlie]

Just resolve the merge issues?

Commit 73e7dd8 breaks against RB-2.5, just ignore the changes coming from RB-2.5.

Also the same with the macports changes in 4253886, but instead accept the changes from RB-2.5.

[rodlie]

This should work? https://github.com/NatronGitHub/Natron/compare/RB-2.6...rodlie:Natron:merge-RB256?expand=1

[acolwell]

This should work? https://github.com/NatronGitHub/Natron/compare/RB-2.6...rodlie:Natron:merge-RB256?expand=1

@rodlie that looks good to me. I think I accidentally didn't do a 'merge commit' when I merged everything before so that is why we have all the commits that were merged already still showing up in this merge. I think what you have there will be a better option than this cherry pick PR because I think it will make future merges from 2.5(please no more) less painful.

Sorry for causing this issue.

[devernay]

cancelling