protonfixes icon indicating copy to clipboard operation
protonfixes copied to clipboard

Merge fixes from GloriousEggroll/protonfixes

Open bmaupin opened this issue 2 years ago • 3 comments

Hi, it looks like https://github.com/GloriousEggroll/protonfixes has a lot of bug fixes (like the corefonts 403) as well as more gamefixes. As an open-source maintainer myself it's a bummer that he's doing all the work in his own fork instead of working with you here.

Would it be possible to merge some of those? Would you accept a PR that merges them?

Thanks!

bmaupin avatar Jul 23 '21 14:07 bmaupin

I had this on the back burner for a while as well. Since both projects are licensed under MIT there should be no problem in backmerging (unless chris has something against it). The engine code fixes could be interesting to add, while the gamefixes are a bit tricky. Basically there are 3 types:

  • Gamefixes that work both in stock proton and ge-proton (easy to add back)
  • Gamefixes that only work in ge-proton (useless to add since there is no way to detect ge-proton at the moment)
  • Gamefixes that need to do different things in vanilla proton and ge-proton (this is similar to the one above where you would have to detect ge-proton and behave differently)

An approach that would simplify things (relatively speaking) is if ge-proton could use upstream protonfixes with some system to have multiple gamefixes directories, maybe with shadowing/priorities (which I would love since proton-ge is easier to install than proton+soldier, and this way there would be no lag between protonfixes and ge-protonfixes) However I do understand that GE does things a bit differently and might like to have a forked repository where he can push to his heart's content without having to wait for a PR to be merged.

mrjackv avatar Jul 24 '21 10:07 mrjackv

Oh that makes sense, I wasn't thinking about fixes that would only work in his fork of Proton. It also makes more sense that he would maintain his own fork of protonfixes given the high rate of changes to his proton fork.

I wonder if it would be worth adding a note to https://github.com/simons-public/protonfixes/wiki/Writing-Gamefixes, something to let people know that before writing a game fix it might be good to first check https://github.com/GloriousEggroll/protonfixes first to see if one exists, then if it does, it can be tested and then a PR can be submitted to merge it with this repository.

bmaupin avatar Jul 24 '21 11:07 bmaupin

From what I can gather, most of the additions to gamefixes seem to be fine to add; there's context for some that also aren't a big issue: notably the ones that just add new verbs to the verbs folder

That aside, there are a few that could be problematic, notably:

  • gamefixes that reference async dxvk (I don't think this is in plain Proton? Only some of them fall in this category)
  • gamefixes that refer to new or edited functions in the root directory (most of them don't fall into this category from what I've seen)
  • fixes involving EA's origin
  • references to use_seccomp(?)

ThisNekoGuy avatar Apr 19 '22 18:04 ThisNekoGuy