pcsx2: 1.7.5004 -> 1.7.5318

[SuperSamus]

Description of changes

Update to the latest version.

One thing I'm not able to implement: one of the changes made upstream is the disabling of Wayland, but you can enable it using the I_WANT_A_BROKEN_WAYLAND_UI environment variable.
This is the best I could do (inside qtWrapperArgs):

    ''--set QT_QPA_PLATFORM "\''$(if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then echo 'xcb'; else echo \'\'; fi)"''

Can someone more knowledgeable of Bash and escape hells fix this?

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[qubitnano]

Result of nixpkgs-review pr 273330 run on x86_64-linux 1

1 package built:

• pcsx2

[qubitnano]

That wayland env seems to just be for the upstream appimage. Wayland is still enabled by default in the cmake flags between these two version.

option(WAYLAND_API "Enable Wayland support" ON)

And from nixpkgs-review build log

-- Found Wayland_Client: /nix/store/pdgavpdmzfwf90k46ybca08bwlc3hzdc-wayland-1.22.0/lib/libwayland-client.so (found version "1.22.0") 
-- Found Wayland_Egl: /nix/store/pdgavpdmzfwf90k46ybca08bwlc3hzdc-wayland-1.22.0/lib/libwayland-egl.so (found version "18.1.0") 
-- Found Wayland: /nix/store/pdgavpdmzfwf90k46ybca08bwlc3hzdc-wayland-1.22.0/lib/libwayland-client.so;/nix/store/pdgavpdmzfwf90k46ybca08bwlc3hzdc-wayland-1.22.0/lib/libwayland-egl.so (found version "1.22.0") found components: Egl

On KDE I get the wayland app icon when running pcsx2-qt

[SuperSamus]

Alright, I managed to implement I_WANT_A_BROKEN_WAYLAND_UI correctly.

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3124

[hrdinka]

Hi, thank you very much for your (ongoing) contributions!

If I understand it correctly, I_WANT_A_BROKEN_WAYLAND_UI is redundant to QT_QPA_PLATFORM=xcb but added to be compatible with the AppImage/official documentation, is this right?

[SuperSamus]

Yes.

[hrdinka]

Tested it locally, could however not test with wayland.

Thank you very much for your great work! 👍