Unverified Commit 0f00ebfe authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

shadps4: 0.11.0 -> 0.12.5, fix build (#457437)

parents 69b16e03 8224f08f

nixos/tests/shadps4.nix

+3 −23
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
  };



  nodes.machine =

    { config, pkgs, ... }:

    { pkgs, ... }:

    {

      imports = [ ./common/x11.nix ];
@@ -80,37 +80,17 @@ 


    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("running example works"):

        # 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 launched anything!".format(openorbisColor)



        machine.succeed("xdotool mousemove 20 30 click 1") # click on "File"

        machine.wait_for_text("Boot Game")

        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/uroot/eboot.bin\n")

        machine.succeed("shadps4 /etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin >&2 &")



        # Look for logo

        with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)):

            retry(check_for_color(openorbisColor))

        machine.screenshot("0003-shadps4-sample-running")

        machine.screenshot("0001-shadps4-sample-running")

  '';

}

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

+4 −10
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
  pipewire,

  pkg-config,

  pugixml,

  qt6,

  rapidjson,

  renderdoc,

  robin-map,
@@ -29,6 +28,7 @@ 
  sndio,

  stb,

  toml11,

  util-linux,

  vulkan-headers,

  vulkan-loader,

  vulkan-memory-allocator,
@@ -42,13 +42,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "shadps4";

  version = "0.11.0";

  version = "0.12.5";



  src = fetchFromGitHub {

    owner = "shadps4-emu";

    repo = "shadPS4";

    tag = "v.${finalAttrs.version}";

    hash = "sha256-ZHgwFWSoEaWILTafet5iQvaLwLtXy3HuCxjkQMt4PBA=";

    hash = "sha256-H/GOnArWxMe/90qgyLb9fXbeJabUOV8CjLtpGokoStQ=";

    fetchSubmodules = true;

  };
@@ -71,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: { 
    libgbm

    pipewire

    pugixml

    qt6.qtbase

    qt6.qtdeclarative

    qt6.qtmultimedia

    qt6.qttools

    qt6.qtwayland

    rapidjson

    renderdoc

    robin-map
@@ -83,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { 
    sndio

    stb

    toml11

    util-linux

    vulkan-headers

    vulkan-loader

    vulkan-memory-allocator
@@ -95,11 +91,9 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    cmake

    pkg-config

    qt6.wrapQtAppsHook

  ];



  cmakeFlags = [

    (lib.cmakeBool "ENABLE_QT_GUI" true)

    (lib.cmakeBool "ENABLE_UPDATER" false)

  ];