From c014421470d4825b3db08d12a77fde95b1e5e907 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 12 Mar 2025 23:42:23 +0100
Subject: [PATCH] openrw: 0-unstable-2024-04-20 -> 0-unstable-2025-01-09

---
 pkgs/by-name/op/openrw/fix-ffmpeg-6.patch | 22 ----------------------
 pkgs/by-name/op/openrw/package.nix        | 12 +++---------
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/by-name/op/openrw/fix-ffmpeg-6.patch

diff --git a/pkgs/by-name/op/openrw/fix-ffmpeg-6.patch b/pkgs/by-name/op/openrw/fix-ffmpeg-6.patch
deleted file mode 100644
index a9d68a2bd294..000000000000
--- a/pkgs/by-name/op/openrw/fix-ffmpeg-6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ad7be040894661b708f9c861696499640ac7f9dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= <lihis@lihis.net>
-Date: Fri, 1 Dec 2023 16:01:59 +0200
-Subject: [PATCH] SoundSource.cpp: return AVERROR_EOF when buffer is empty
-
----
- rwengine/src/audio/SoundSource.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rwengine/src/audio/SoundSource.cpp b/rwengine/src/audio/SoundSource.cpp
-index c93376e73..d355cab74 100644
---- a/rwengine/src/audio/SoundSource.cpp
-+++ b/rwengine/src/audio/SoundSource.cpp
-@@ -55,7 +55,7 @@ int read_packet(void* opaque, uint8_t* buf, int buf_size) {
-     memcpy(buf, input->ptr, buf_size);
-     input->ptr += buf_size;
-     input->size -= buf_size;
--    return buf_size;
-+    return buf_size <= 0 ? AVERROR_EOF : buf_size;
- }
- }  // namespace
- 
diff --git a/pkgs/by-name/op/openrw/package.nix b/pkgs/by-name/op/openrw/package.nix
index 477f8d2cf342..f19a44e81693 100644
--- a/pkgs/by-name/op/openrw/package.nix
+++ b/pkgs/by-name/op/openrw/package.nix
@@ -17,23 +17,17 @@
 }:
 
 stdenv.mkDerivation {
-  version = "0-unstable-2024-04-20";
+  version = "0-unstable-2025-01-09";
   pname = "openrw";
 
   src = fetchFromGitHub {
     owner = "rwengine";
     repo = "openrw";
-    rev = "f10a5a8f7abc79a0728847e9a10ee104a1216047";
-    hash = "sha256-4ydwPh/pCzuZNNOyZuEEeX4wzI+dqTtAxUyXOXz76zk=";
+    rev = "556cdfbbf1fb5b3ddef5e43f36e97976be0252fc";
+    hash = "sha256-NYn89KGMITccVdqGo7NUS45HxXGurR9QDbVKEagjFqk=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # SoundSource.cpp: return AVERROR_EOF when buffer is empty
-    # https://github.com/rwengine/openrw/pull/747
-    ./fix-ffmpeg-6.patch
-  ];
-
   postPatch = lib.optional (stdenv.cc.isClang && (lib.versionAtLeast stdenv.cc.version "9")) ''
     substituteInPlace cmake_configure.cmake \
       --replace 'target_link_libraries(rw_interface INTERFACE "stdc++fs")' ""