[24.11] shadps4: 0.4.0 -> 0.5.0-unstable-2025-01-02 (#370922)

nixos/tests/all-tests.nix

@@ -904,6 +904,7 @@ in {
   seatd = handleTest ./seatd.nix {};
   send = runTest ./send.nix;
   service-runner = handleTest ./service-runner.nix {};
+  shadps4 = runTest ./shadps4.nix;
   sftpgo = runTest ./sftpgo.nix;
   sfxr-qt = handleTest ./sfxr-qt.nix {};
   sgt-puzzles = handleTest ./sgt-puzzles.nix {};

nixos/tests/shadps4.nix

@@ -0,0 +1,141 @@
+{ pkgs, lib, ... }:
+{
+  name = "shadps4-openorbis-example";
+  meta = {
+    inherit (pkgs.shadps4.meta) maintainers;
+    platforms = lib.intersectLists lib.platforms.linux pkgs.shadps4.meta.platforms;
+  };
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
+      imports = [ ./common/x11.nix ];
+
+      environment = {
+        # Samples from the OpenOrbis PS4 homebrew toolchain, gpl3Only
+        etc."openorbis-sample-packages".source =
+          let
+            sample-packages = pkgs.fetchurl {
+              url = "https://github.com/OpenOrbis/OpenOrbis-PS4-Toolchain/releases/download/v0.5.2/sample-packages.zip";
+              hash = "sha256-aWocIVpyMivA1vsUe9w97J3eMFANyXxyVLBxHGXIcEA=";
+            };
+          in
+          pkgs.runCommand "OpenOrbis-PNG-Sample"
+            {
+              nativeBuildInputs = with pkgs; [ unzip ];
+              meta.license = lib.licenses.gpl3Only;
+            }
+            ''
+              unzip ${sample-packages} samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg
+              mkdir $out
+              mv samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg $out/OpenOrbis-PNG-Sample.pkg
+            '';
+
+        systemPackages = with pkgs; [
+          imagemagick # looking for colour on screen
+          shadps4
+          xdotool # move mouse
+        ];
+
+        variables = {
+          # Emulated CPU doesn't support invariant TSC
+          TRACY_NO_INVARIANT_CHECK = "1";
+        };
+      };
+    };
+
+  enableOCR = true;
+
+  testScript = ''
+    from collections.abc import Callable
+    import tempfile
+    import subprocess
+
+    selectionColor: str = "#2A82DA"
+    openorbisColor: str = "#336081"
+
+    # Based on terminal-emulators.nix' check_for_pink
+    def check_for_color(color: str) -> Callable[[bool], bool]:
+        def check_for_color_retry(final=False) -> bool:
+            with tempfile.NamedTemporaryFile() as tmpin:
+                machine.send_monitor_command("screendump {}".format(tmpin.name))
+
+                cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format(
+                    tmpin.name
+                )
+                ret = subprocess.run(cmd, shell=True, capture_output=True)
+                if ret.returncode != 0:
+                    raise Exception(
+                        "image analysis failed with exit code {}".format(ret.returncode)
+                    )
+
+                text = ret.stdout.decode("utf-8")
+                return color in text
+
+        return check_for_color_retry
+
+    machine.wait_for_x()
+
+    with subtest("starting shadps4 works"):
+        machine.succeed("shadps4 >&2 &")
+        machine.wait_for_text("Directory to install games")
+        machine.screenshot("0001-shadps4-dir-setup-prompt")
+
+        machine.send_chars("/root\n")
+        machine.wait_for_text("Game List")
+        # Make it fullscreen, so mouse coords are simpler & content isn't cut off
+        machine.send_key("alt-f10")
+        # Should now see the rest too
+        machine.wait_for_text("Play Time")
+        machine.screenshot("0002-shadps4-started")
+
+    with subtest("installing example works"):
+        machine.succeed("xdotool mousemove 20 30 click 1") # click on "File"
+        machine.wait_for_text("Install Packages")
+        machine.send_key("down")
+        machine.send_key("ret")
+
+        # Pick the PNG sample (hello world runs too, but text-only output is currently broken)
+        machine.wait_for_text("Look in")
+        machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample.pkg\n")
+
+        # Install to default dir
+        machine.wait_for_text("which directory")
+        machine.send_key("ret")
+
+        # Wait for installation getting done & return to main window
+        machine.wait_for_text("successfully installed")
+        machine.send_key("ret")
+
+        # Sample should now be listed
+        machine.wait_for_text("OpenOrbis PNG Sample")
+        machine.screenshot("0003-shadps4-sample-installed")
+
+    with subtest("emulation works-ish"):
+        # Ensure that selection colours isn't present already
+        assert (
+            check_for_color(selectionColor)(True) == False
+        ), "selectionColor {} was present on the screen before we selected anything!".format(selectionColor)
+
+        # Select first installed app
+        machine.succeed("xdotool mousemove 20 150 click 1")
+
+        # Waiting for selection to be confirmed
+        with machine.nested("Waiting for the screen to have selectionColor {} on it:".format(selectionColor)):
+            retry(check_for_color(selectionColor))
+
+        # Ensure that chosen openorbis logo colour isn't present already
+        assert (
+            check_for_color(openorbisColor)(True) == False
+        ), "openorbisColor {} was present on the screen before we selected anything!".format(openorbisColor)
+
+        # Click launch button
+        machine.succeed("xdotool mousemove 40 60 click 1")
+        machine.wait_for_console_text("Entering draw loop...")
+
+        # Look for logo
+        with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)):
+            retry(check_for_color(openorbisColor))
+        machine.screenshot("0004-shadps4-sample-running")
+  '';
+}

pkgs/by-name/sh/shadps4/laptop-controls.patch

@@ -1,11 +1,20 @@
+From 0a93bc8850b4b1608d77b123cdb1875f60635e6d Mon Sep 17 00:00:00 2001
+From: OPNA2608 <[email protected]>
+Date: Sat, 7 Dec 2024 10:47:29 +0100
+Subject: [PATCH] Support keypad-less keyboards everywhere
+
+---
+ src/sdl_window.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
 diff --git a/src/sdl_window.cpp b/src/sdl_window.cpp
-index bd2cc39d..13438149 100644
+index d95e8d63..ac8c5c72 100644
 --- a/src/sdl_window.cpp
 +++ b/src/sdl_window.cpp
-@@ -127,19 +127,12 @@ void WindowSDL::onResize() {
- void WindowSDL::onKeyPress(const SDL_Event* event) {
-     using Libraries::Pad::OrbisPadButtonDataOffset;
+@@ -174,19 +174,12 @@ void WindowSDL::OnResize() {
+ }
 
+ void WindowSDL::OnKeyPress(const SDL_Event* event) {
 -#ifdef __APPLE__
      // Use keys that are more friendly for keyboards without a keypad.
      // Once there are key binding options this won't be necessary.
@@ -20,5 +29,8 @@ index bd2cc39d..13438149 100644
 -    constexpr SDL_Keycode TriangleKey = SDLK_KP_8;
 -#endif
 
-     u32 button = 0;
+     auto button = OrbisPadButtonDataOffset::None;
      Input::Axis axis = Input::Axis::AxisMax;
+-- 
+2.47.0
+