colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #301855 from Atemu/update/ffmpeg 

ffmpeg_7: init at 7.0
This commit is contained in:
Atemu 2024-04-09 09:36:51 +02:00 committed by GitHub
parent a2fae8c20e 37d6aef521
commit a2e234a97f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -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

8
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -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 = [];

3
pkgs/top-level/all-packages.nix
View File

@ -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;