From 1a0bcbcb08b9f7614ad2644a166493eb6e35c3eb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 1 Sep 2022 05:54:12 +1000 Subject: [PATCH] ffmpeg_5: 5.1 -> 5.1.1 https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/1bad30dbe34f2d100b43e8f773d3fe0b5eb23523:/Changelog#l4 --- .../libraries/ffmpeg-full/default.nix | 4 -- pkgs/development/libraries/ffmpeg/5.nix | 10 +---- .../ffmpeg/ipfs-remove-default-gateway.patch | 37 ------------------- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 1bc3d49bea2feb..e4c6d4b013c671 100644 --- 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 index 22dbe293ef853a..b16bd4ddf38137 100644 --- 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 deleted file mode 100644 index e4b25a4b6cbfe5..00000000000000 --- a/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch +++ /dev/null @@ -1,37 +0,0 @@ -A gateway can see everything, and we should not be shipping a hardcoded -default from a third party company; it's a security risk. - -Signed-off-by: Derek Buitenhuis ---- - libavformat/ipfsgateway.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c -index 5a5178c563..907b61b017 100644 ---- a/libavformat/ipfsgateway.c -+++ b/libavformat/ipfsgateway.c -@@ -240,13 +240,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD - ret = populate_ipfs_gateway(h); - - if (ret < 1) { -- // We fallback on dweb.link (managed by Protocol Labs). -- snprintf(c->gateway_buffer, sizeof(c->gateway_buffer), "https://dweb.link"); -- -- av_log(h, AV_LOG_WARNING, -- "IPFS does not appear to be running. " -- "You’re now using the public gateway at dweb.link.\n"); -- av_log(h, AV_LOG_INFO, -+ av_log(h, AV_LOG_ERROR, -+ "IPFS does not appear to be running.\n\n" - "Installing IPFS locally is recommended to " - "improve performance and reliability, " - "and not share all your activity with a single IPFS gateway.\n" -@@ -259,6 +254,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD - "3. Define an $IPFS_PATH environment variable " - "and point it to the IPFS data path " - "- this is typically ~/.ipfs\n"); -+ ret = AVERROR(EINVAL); -+ goto err; - } - } -