diff options
| author | Atemu <atemu.main@gmail.com> | 2024-04-09 09:36:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-09 09:36:51 +0200 |
| commit | a2e234a97f9488f563ced4fe3356c7ee7868c697 (patch) | |
| tree | 5d30284f793c7d1619042467e105bbd6a91619a0 | |
| parent | a2fae8c20e2811f987145ac88f777f2b92288f3b (diff) | |
| parent | 37d6aef521999114dd8e92dc147e39178b7257b8 (diff) | |
Merge pull request #301855 from Atemu/update/ffmpeg
ffmpeg_7: init at 7.0
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 5c15239541d86..65e12e6b36729 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/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6ed7dfc7b757a..2be86d5cb85ad 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 = []; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 494763899b2c3..6fdde2f5bd887 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20873,6 +20873,9 @@ with pkgs; ffmpeg_6 ffmpeg_6-headless ffmpeg_6-full + ffmpeg_7 + ffmpeg_7-headless + ffmpeg_7-full ffmpeg ffmpeg-headless ffmpeg-full; |