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

add: proton-osu-bin and umu osu #213

Merged
merged 28 commits into from
Nov 17, 2024
Merged

Conversation

ProspectPyxis
Copy link
Contributor

@ProspectPyxis ProspectPyxis commented Oct 20, 2024

This PR does two things:

  • It creates a new proton-osu-bin package, packaged from the build artifacts of https://github.com/whrvt/umubuilder. The code is directly copied from proton-ge-bin in base nixpkgs.
  • It adds umu capabilities to osu-stable, similar to star-citizen. This is set to use the aforementioned proton-osu by default.

Related to #207 - this doesn't directly fix wine-osu, but adds a new method to run osu-stable with patches that provide the same benefit.

The issue below has been solved! This PR is fully functional - I will leave the logs here for archival purposes, though.


Unfortunately, I'm currently unable to get the useUmu version working on my machine - the install process works fine, but the game crashes immediately after the icon splash, complaining about driver files. Here are the logs (removing extraneous logs from gamemoderun):

Crash Log
ProtonFixes[604843] INFO: Running protonfixes
ProtonFixes[604843] INFO: Running checks
ProtonFixes[604843] INFO: All checks successful
ProtonFixes[604843] WARN: Game title not found in CSV
ProtonFixes[604843] INFO: Non-steam game UNKNOWN (osu-wine-umu)
ProtonFixes[604843] INFO: No store specified, using UMU database
ProtonFixes[604843] INFO: Using global defaults for UNKNOWN (osu-wine-umu)
ProtonFixes[604843] INFO: Non-steam game UNKNOWN (osu-wine-umu)
ProtonFixes[604843] INFO: No store specified, using UMU database
ProtonFixes[604843] INFO: No global protonfix found for UNKNOWN (osu-wine-umu)
Proton: /home/user/.osu/drive_c/osu/osu!.exe
Proton: Executable a unix path, launching with /unix option.
fsync: up and running.
wineserver: failed to change priority to SCHED_FIFO/1
libGL error: MESA-LOADER: failed to open iris: /usr/lib/pressure-vessel/overrides/lib/x86_64-linux-gnu/dri/iris_dri.so: wrong ELF class: ELFCLASS64 (search paths /usr/lib/pressure-vessel/overrides/lib/x86_64-linux-gnu/dri)
libGL error: failed to load driver: iris
libGL error: MESA-LOADER: failed to open iris: /usr/lib/pressure-vessel/overrides/lib/x86_64-linux-gnu/dri/iris_dri.so: wrong ELF class: ELFCLASS64 (search paths /usr/lib/pressure-vessel/overrides/lib/x86_64-linux-gnu/dri)
libGL error: failed to load driver: iris
libGL error: MESA-LOADER: failed to open swrast: /usr/lib/pressure-vessel/overrides/lib/x86_64-linux-gnu/dri/swrast_dri.so: wrong ELF class: ELFCLASS64 (search paths /usr/lib/pressure-vessel/overrides/lib/x86_64-linux-gnu/dri)
libGL error: failed to load driver: swrast
X Error of failed request:  GLXBadContext
  Major opcode of failed request:  152 (GLX)
  Minor opcode of failed request:  6 (X_GLXIsDirect)
  Serial number of failed request:  521
  Current serial number in output stream:  520

This happens regardless of the proton version used - I've set it to proton-ge-bin as well for the same result.

I'm unsure why this error occurs, and am submitting this PR now in hopes of getting more eyes on the problem.

@ProspectPyxis
Copy link
Contributor Author

Apparently umu being broken is an upstream issue: Open-Wine-Components/umu-launcher#246

Also, what program is used to format? I'd like to fix the broken formatting.

@ProspectPyxis ProspectPyxis changed the title add: proton-osu and umu osu add: proton-osu-bin and umu osu Oct 23, 2024
@ProspectPyxis
Copy link
Contributor Author

Upstream bug has been fixed and tests are now passing.

Whenever umu is updated in this flake, this should be good to merge.

@ProspectPyxis ProspectPyxis marked this pull request as ready for review October 23, 2024 02:20
@ProspectPyxis
Copy link
Contributor Author

Apologies for the bump, but is anything else needed for this to be merged? I've been using this branch personally with umu enabled with no problems.

@fufexan
Copy link
Owner

fufexan commented Nov 17, 2024

Oh, I forgot about this. Should've pinged me sooner.

Copy link
Owner

@fufexan fufexan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@fufexan fufexan merged commit 88cd24b into fufexan:master Nov 17, 2024
9 checks passed
@ProspectPyxis ProspectPyxis deleted the proton-osu branch November 17, 2024 13:25
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