b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ffmpeg_5: 5.1 -> 5.1.1

Browse source 
1bad30dbe3:/Changelog#l4
This commit is contained in:
zowoq 2022-09-01 05:54:12 +10:00
parent b8a9e83fd3
commit 1a0bcbcb08
3 changed files with 2 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg-full/default.nix
View file

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

10
pkgs/development/libraries/ffmpeg/5.nix
View file

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

37
pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch
View file

@ -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 <derek.buitenhuis@gmail.com>
---
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;
}
}