Unverified Commit 253d7b46 authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

shadps4: 0.5.0-unstable-2025-01-20 -> 0.6.0-unstable-2025-03-07, add sdl3 to buildInputs (#388273)

parents 300ef195 01ce340a

nixos/tests/shadps4.nix

+4 −2
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
          TRACY_NO_INVARIANT_CHECK = "1";

        };

      };



      virtualisation.memorySize = 2048;

    };



  enableOCR = true;
@@ -51,8 +53,8 @@ 
    import tempfile

    import subprocess



    selectionColor: str = "#2A82DA"

    openorbisColor: str = "#336081"

    selectionColor: str = "#354953"

    openorbisColor: str = "#306082"



    # Based on terminal-emulators.nix' check_for_pink

    def check_for_color(color: str) -> Callable[[bool], bool]:

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

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
From 0a93bc8850b4b1608d77b123cdb1875f60635e6d Mon Sep 17 00:00:00 2001

From: OPNA2608 <opna2608@protonmail.com>

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 d95e8d63..ac8c5c72 100644

--- a/src/sdl_window.cpp

+++ b/src/sdl_window.cpp

@@ -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.

     constexpr SDL_Keycode CrossKey = SDLK_N;

     constexpr SDL_Keycode CircleKey = SDLK_B;

     constexpr SDL_Keycode SquareKey = SDLK_V;

     constexpr SDL_Keycode TriangleKey = SDLK_C;

-#else

-    constexpr SDL_Keycode CrossKey = SDLK_KP_2;

-    constexpr SDL_Keycode CircleKey = SDLK_KP_6;

-    constexpr SDL_Keycode SquareKey = SDLK_KP_4;

-    constexpr SDL_Keycode TriangleKey = SDLK_KP_8;

-#endif

 

     auto button = OrbisPadButtonDataOffset::None;

     Input::Axis axis = Input::Axis::AxisMax;

-- 

2.47.0

pkgs/by-name/sh/shadps4/package.nix

+5 −8
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
  rapidjson,

  renderdoc,

  robin-map,

  sdl3,

  sndio,

  stb,

  vulkan-headers,
@@ -37,21 +38,16 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "shadps4";

  version = "0.5.0-unstable-2025-01-20";

  version = "0.6.0-unstable-2025-03-07";



  src = fetchFromGitHub {

    owner = "shadps4-emu";

    repo = "shadPS4";

    rev = "95a30b2b3e1aa4e20c3db632955cc67bbded0fb1";

    hash = "sha256-52BhGKSUv+9asACNkppxiNm3Gja7r3LcXOIwhQR5ALs=";

    rev = "6b3746f3a688cd4c7c2acfbbe8238ebd97235d37";

    hash = "sha256-j5gIrSmQsc7nbDJ0OeFPpauHBOCADFykN0RMjCA8P8A=";

    fetchSubmodules = true;

  };



  patches = [

    # Fix controls without a numpad

    ./laptop-controls.patch

  ];



  buildInputs = [

    alsa-lib

    boost
@@ -78,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { 
    rapidjson

    renderdoc

    robin-map

    sdl3

    sndio

    stb

    vulkan-headers