search

flathub / com.valvesoftware.Steam.CompatibilityTool.Proton-GE

https://flathub.org/apps/details/com.valvesoftware.Steam.CompatibilityTool.Proton-GE
50 stars 5 forks source link

Update Proton-GE to 9.10 #190

Closed ChrisHobday closed 3 months ago

ChrisHobday commented 3 months ago

Updates Proton-GE to 9.10, switch to using the Proton-GE archived releases instead of building all the modules from source, removes unneeded folders and files, and update ReadMe to better reflect the changes. Note: the many commits are progressively updating the missing versions.

flathubbot commented 3 months ago

Started test build 134657

bbhtt commented 3 months ago

Can you please squash the Update to Proton-GE $versio commits? They don't need to be separate, it makes reviewing by commit a bit heard.

flathubbot commented 3 months ago

Build 134657 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/117675/com.valvesoftware.Steam.CompatibilityTool.Proton-GE.flatpakref
flathubbot commented 3 months ago

Started test build 134661

ChrisHobday commented 3 months ago

Alright https://github.com/flathub/com.valvesoftware.Steam.CompatibilityTool.Proton-GE/pull/190/commits/3729a457bd415605154733ddd35a1f08dd7c6c53 is the squashed version of all the commits.

flathubbot commented 3 months ago

Build 134661 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/117679/com.valvesoftware.Steam.CompatibilityTool.Proton-GE.flatpakref
bbhtt commented 3 months ago

Something is wrong, Github is preventing me from commenting on the PR. Probably the large squash confused it.

image

bbhtt commented 3 months ago

A few comments:

It seems you dropped most of wine and vulkan parts from the original manifest - why?

ChrisHobday commented 3 months ago

I'll remove the appsteam-compose lines.

I did have the release as an archive source and the toolmanifest.patch as a patch source originally, but was having trouble figuring out how to have it apply the toolmanifest.patch to the archive, and so resorted to making them both files and manually taring it first and using the patch command in the build-commands instead. I'll look into getting a patch source to apply to archives again.

The sed patch was also a compatibilitytool.patch file at first, but was not able to be applied between releases because the compatibilitytool.vdf file changes to include the release version with each update, so I'm not sure there is a better way than using the regex of sed so that the patch works between releases.

I believe everything needed is included in the archived release, and wine/vulkan are not needed separately. In my testing I was able to play Baldur's Gate 3 (Vulkan), Doom Eternal, and Resident Evil 2, all in conjunction with the Gamescope Flatpak and with HDR working.

bbhtt commented 3 months ago

I did have the release as an archive source and the toolmanifest.patch as a patch source originally, but was having trouble figuring out how to have it apply the toolmanifest.patch to the archive, and so resorted to making them both files and manually taring it first and using the patch command in the build-commands instead. I'll look into getting a patch source to apply to archives again.

The sed patch was also a compatibilitytool.patch file at first, but was not able to be applied between releases because the compatibilitytool.vdf file changes to include the release version with each update, so I'm not sure there is a better way than using the regex of sed so that the patch works between releases.

A patch would be best You can find the docs here if needed https://docs.flatpak.org/en/latest/module-sources.html

You likely need to modify the patch path marker on the top so that applies. It should be ./path/....

Lctrs commented 3 months ago

1) Please keep the symlinks from com.valvesoftware.Steam.CompatibilityTool.Proton-GE.yml to com.valvesoftware.Steam.CompatibilityTool.Proton.yml, it makes it easier to backport commits from and to com.valvesoftware.Steam.CompatibilityTool.Proton (same for the metainfo file). 2) Reason we had a custom archive build was to pre patch the sources with https://github.com/GloriousEggroll/proton-ge-custom/blob/master/patches/protonprep-valve-staging.sh, which saved a lot of build time. Are the sources from github already patched ?

ChrisHobday commented 3 months ago

I'll add the symlinks back.

Looking at the Proton-GE workflow build file https://github.com/GloriousEggroll/proton-ge-custom/blob/master/.github/workflows/build.yml , I do see a section that appears to be applying the proton-ge-custom patches and I think this is how the releases are being made.

flathubbot commented 3 months ago

Started test build 134737

flathubbot commented 3 months ago

Build 134737 successful To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/117759/com.valvesoftware.Steam.CompatibilityTool.Proton-GE.flatpakref
ChrisHobday commented 3 months ago

I've made the requested changes, and retested the same Steam games with the flathubbot provided install.

ChrisHobday commented 3 months ago

I've been added as a maintainer. I'm going to leave this pull request up for another couple of days before merging it, to give anyone else interested a chance to test it out or request changes.