Merge pull request #280740 from SuperSamus/pcsx2-update

pcsx2: 1.7.5318 -> 1.7.5474

pkgs/applications/emulators/pcsx2/default.nix

@@ -6,14 +6,13 @@
 , curl
 , extra-cmake-modules
 , ffmpeg
-, gettext
-, harfbuzz
 , libaio
 , libbacktrace
 , libpcap
-, libsamplerate
+, libwebp
 , libXrandr
 , libzip
+, lz4
 , makeWrapper
 , pkg-config
 , qtbase
@@ -29,6 +28,7 @@
 , wrapQtAppsHook
 , xz
 , zip
+, zstd
 }:
 
 let
@@ -36,26 +36,30 @@ let
   pcsx2_patches = fetchFromGitHub {
     owner = "PCSX2";
     repo = "pcsx2_patches";
-    rev = "42d7ee72b66955e3bbd2caaeaa855f605b463722";
-    sha256 = "sha256-Zd+Aeps2IWVX2fS1Vyczv/wAX8Z89XnCH1eqSPdYEw8=";
+    rev = "619e75bb8db50325b44863f2ccf3c39470c3d5a3";
+    sha256 = "sha256-2KE0W3WwBJCLe8DosyDVsFtEofKgBsChpQEQe+3O+Hg=";
   };
 in
 llvmPackages_17.stdenv.mkDerivation rec {
   pname = "pcsx2";
-  version = "1.7.5318";
+  version = "1.7.5474";
 
   src = fetchFromGitHub {
     owner = "PCSX2";
     repo = "pcsx2";
     fetchSubmodules = true;
     rev = "v${version}";
-    sha256 = "sha256-5SUlq3HQAzROG1yncA4u4XGVv+1I+s9FQ6LgJkiLSD0=";
+    sha256 = "sha256-5ZCXw6PEQ6Ed6kEP27m9O0U79uVGEFR/vwee6/dZBD8=";
   };
 
+  patches = [
+    ./define-rev.patch
+  ];
+
   cmakeFlags = [
     "-DDISABLE_ADVANCE_SIMD=ON"
     "-DUSE_LINKED_FFMPEG=ON"
-    "-DDISABLE_BUILD_DATE=ON"
+    "-DPCSX2_GIT_REV=v${version}"
   ];
 
   nativeBuildInputs = [
@@ -70,14 +74,13 @@ llvmPackages_17.stdenv.mkDerivation rec {
   buildInputs = [
     curl
     ffmpeg
-    gettext
-    harfbuzz
     libaio
     libbacktrace
     libpcap
-    libsamplerate
+    libwebp
     libXrandr
     libzip
+    lz4
     qtbase
     qtsvg
     qttools
@@ -85,9 +88,9 @@ llvmPackages_17.stdenv.mkDerivation rec {
     SDL2
     soundtouch
     vulkan-headers
-    vulkan-loader
     wayland
     xz
+    zstd
   ]
   ++ cubeb.passthru.backendLibs;
 

pkgs/applications/emulators/pcsx2/define-rev.patch

@@ -0,0 +1,12 @@
+diff --git a/cmake/Pcsx2Utils.cmake b/cmake/Pcsx2Utils.cmake
+index 87f012c..052f1be 100644
+--- a/cmake/Pcsx2Utils.cmake
++++ b/cmake/Pcsx2Utils.cmake
+@@ -44,7 +44,6 @@ function(detect_compiler)
+ endfunction()
+ 
+ function(get_git_version_info)
+-	set(PCSX2_GIT_REV "")
+ 	set(PCSX2_GIT_TAG "")
+ 	set(PCSX2_GIT_HASH "")
+ 	if (GIT_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.git)