ffmpeg_5: 5.1 -> 5.1.1

https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/1bad30dbe34f2d100b43e8f773d3fe0b5eb23523:/Changelog#l4
NixOS · Sep 1, 2022 · 1a0bcbc · 1a0bcbc
1 parent b8a9e83
commit 1a0bcbc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 49 deletions.
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -261,10 +261,6 @@ stdenv.mkDerivation rec {
       --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
     substituteInPlace doc/filters.texi \
       --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
-  '' +
-  # ffmpeg 5.1 https://trac.ffmpeg.org/ticket/9841
-  ''
-    substituteInPlace tests/Makefile --replace 'include $(SRC_PATH)/tests/fate/imf.mak' ""
   '';
 
   configurePlatforms = [];

diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix
@@ -5,14 +5,8 @@
 }@args:
 
 callPackage ./generic.nix (rec {
-  version = "5.1";
+  version = "5.1.1";
   branch = version;
-  sha256 = "sha256-MrVvsBzpDUUpWK4l6RyVZKv0ntVFPBJ77CPGPlMKqPo=";
+  sha256 = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs=";
   darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
-
-  # Newly introduced IPFS support in ffmpeg 5.1 relies on untrusted third
-  # party services, leading to consent and privacy issues. See upstream
-  # discussion for more information:
-  # https://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299924.html
-  patches = [ ./ipfs-remove-default-gateway.patch ];
 } // args)
diff --git a/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch b/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch