From c0fe794bff594f35b968a998091638bba641c5db Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 5 Apr 2024 16:18:13 +0200
Subject: [PATCH 1/2] ffmpeg_7: init at 7.0

---
 pkgs/development/libraries/ffmpeg/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix               | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 5c15239541d8..65e12e6b3672 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -33,6 +33,11 @@ let
     version = "6.1.1";
     hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo=";
   };
+
+  v7 = {
+    version = "7.0";
+    hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM=";
+  };
 in
 
 rec {
@@ -48,6 +53,10 @@ rec {
   ffmpeg_6-headless = mkFFmpeg v6 "headless";
   ffmpeg_6-full = mkFFmpeg v6 "full";
 
+  ffmpeg_7 = mkFFmpeg v7 "small";
+  ffmpeg_7-headless = mkFFmpeg v7 "headless";
+  ffmpeg_7-full = mkFFmpeg v7 "full";
+
   # Please make sure this is updated to the latest version on the next major
   # update to ffmpeg
   # Packages which use ffmpeg as a library, should pin to the relevant major
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1fb55c5584c..59438e97fb48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20899,6 +20899,9 @@ with pkgs;
     ffmpeg_6
     ffmpeg_6-headless
     ffmpeg_6-full
+    ffmpeg_7
+    ffmpeg_7-headless
+    ffmpeg_7-full
     ffmpeg
     ffmpeg-headless
     ffmpeg-full;

From 37d6aef521999114dd8e92dc147e39178b7257b8 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 5 Apr 2024 20:45:59 +0200
Subject: [PATCH 2/2] ffmpeg_7: add patch to fix checks

https://trac.ffmpeg.org/ticket/10947#comment:1
---
 pkgs/development/libraries/ffmpeg/generic.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6ed7dfc7b757..2be86d5cb85a 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -405,6 +405,14 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24";
         hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg=";
       }
+    ])
+    ++ (lib.optionals (lib.versionAtLeast version "7.0") [
+      {
+        # Will likely be obsolete in >7.0
+        name = "fate_avoid_dependency_on_samples";
+        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834";
+        hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I=";
+      }
     ]));
 
   configurePlatforms = [];