Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flatpak: fix extention points, Java auto-detect and add Openjdk21 #5

Closed
wants to merge 1 commit into from

Conversation

zocker-160
Copy link

This is based on and ported over from fn2006/PollyMC#131 to FjordLauncher with following changes:

  • replaced deprecated / EOL com.valvesoftware.Steam.Utility.gamescope extension
  • moved ENV variables from starter script into manifest, this way PATH is set correctly also when I use a custom command inside the Flatpak
  • fixed Java 8 appearing twice in the version selector auto-detect function thingy
  • added OpenJDK 21 for Minecraft >= 1.20.5
  • switched x11 socket to fallback-x11, since wayland is the primary socket to use when available
  • added extension point for MangoHud, if installed using
flatpak install org.freedesktop.Platform.VulkanLayer.MangoHud//23.08

the MangoHud checkbox will be available in the UI:

Screenshot_20240412_151956

@evan-goode
Copy link
Member

Hi, thanks for bringing this up, I noticed your PR on PollyMC.

IMO this kind of thing should be merged upstream to Prism Launcher before being merged to Fjord Launcher (or other Prism derivatives). I'd rather keep Fjord Launcher as close to upstream as possible and only accept patches that relate directly to Fjord's goals insofar as they differ from upstream's (i.e. alternative auth).

Prioritizing contributing to upstream means (1) long-term maintainance of Fjord will be easier and (2) upstream and other forks can benefit from the contributions as well.

So would you consider filing this to Prism Launcher instead? If not, I'd be happy to merge this PR on a separate branch of Fjord and try to upstream the work myself, but you certainly understand the changes better than I do, so you could communicate them better.

@zocker-160
Copy link
Author

zocker-160 commented May 20, 2024

IMO this kind of thing should be merged upstream to Prism Launcher

Ok yeah I agree with your point, it makes sense to stay as close to upstream as possible.

The reason why I did this PR is mainly, because 1) this Flatpak has not been kept in sync with upstream manifest and 2) I cannot contribute upstream since I have no way of testing if the changes actually work (I have never agreed to the requirement of a MS account, despite paying for this damn game twice, but I digress).

So would you consider filing this to Prism Launcher instead?

Actually I think the only thing that needs to be done is to get the Flatpak manifest in sync in order to have a usable one for FjordLauncher again.

@zocker-160 zocker-160 closed this May 20, 2024
evan-goode pushed a commit that referenced this pull request Oct 26, 2024
Disable folder action instead of hiding it and add additional informa…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants