Unverified Commit a2e234a9 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #301855 from Atemu/update/ffmpeg 

ffmpeg_7: init at 7.0
parents a2fae8c2 37d6aef5

pkgs/development/libraries/ffmpeg/default.nix

+9 −0
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/ffmpeg/generic.nix

+8 −0
Original line number Diff line number Diff line
@@ -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 = [];

pkgs/top-level/all-packages.nix

+3 −0
Original line number Diff line number Diff line
@@ -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;