From c47eb3a51e0894e1c4288dd7a8717e80fc2efdaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 25 Jun 2026 16:01:13 -0700
Subject: [PATCH] servarr-ffmpeg: 5.1.4 -> 5.1.10

(cherry picked from commit d0c4459538416fdfe49f89fdbb99108477de2571)
---
 pkgs/by-name/se/servarr-ffmpeg/package.nix    | 6 +++---
 pkgs/development/libraries/ffmpeg/generic.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servarr-ffmpeg/package.nix b/pkgs/by-name/se/servarr-ffmpeg/package.nix
index 197e817f393e..0692c8a38bc2 100644
--- a/pkgs/by-name/se/servarr-ffmpeg/package.nix
+++ b/pkgs/by-name/se/servarr-ffmpeg/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "5.1.4";
+  version = "5.1.10";
 in
 
 (ffmpeg-headless.override {
@@ -17,8 +17,8 @@ in
   source = fetchFromGitHub {
     owner = "Servarr";
     repo = "FFmpeg";
-    rev = "e9230b4c9027435dd402a68833f144643a3df43a";
-    hash = "sha256-oMIblMOnnYpKvYeleCZpFZURGVc3fDAlYpOJu+u7HkU=";
+    rev = "9eecad42d64ab888b9bb366df998b5b7cac0e2bc";
+    hash = "sha256-8qXQIbBNFRX3HsEHD2m4STHyxALqTSoIkKrVLc6vX/4=";
   };
 
   buildFfmpeg = false;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6c16418a2c51..91eff80b0b17 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -460,7 +460,7 @@ stdenv.mkDerivation (
           hash = "sha256-ulB5BujAkoRJ8VHou64Th3E94z6m+l6v9DpG7/9nYsM=";
         })
       ]
-      ++ optionals (lib.versionOlder version "7.1.1") [
+      ++ optionals (lib.versionOlder version "7.1.1" && lib.versions.major version != "5") [
         (fetchpatch2 {
           name = "texinfo-7.1.patch";
           url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4d9cdf82ee36a7da4f065821c86165fe565aeac2";