From ec3cb5eab5707c43f70a1910200ee3e67215f716 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Apr 2023 06:55:33 +0000 Subject: [PATCH 1/3] svt-av1: 1.4.1 -> 1.5.0 --- pkgs/tools/video/svt-av1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 8cf9dc849896..2d722d7037a8 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jmr5egbuqLnBW7OFuaQk3F4s5xqTpXhWcJAfZySGWeU="; + sha256 = "sha256-EBWtvHOcFa6co0NeYns7Wkhz3LhqWJIRjBWfCrWJyss="; }; nativeBuildInputs = [ From e03a6c1c1d30c1b50fc22d80d8daf1a3a1ec0cb8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 1 May 2023 10:59:05 +0100 Subject: [PATCH 2/3] ffmpeg_5: add patches for svt-av1 1.5.0 compatibility from 6.0 branch --- pkgs/development/libraries/ffmpeg/5.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index 0aa176bb8d24..dcfe033f040f 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -1,4 +1,21 @@ import ./generic.nix rec { version = "5.1.3"; sha256 = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; + extraPatches = [ + { + name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; + hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; + } + { + name = "libsvtav1-1.5.0-compat-vbv_bufsize.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee"; + hash = "sha256-v9Viyo12QfZpbcVqd1aHgLl/DgSkdE9F1kr6afTGPik="; + } + { + name = "libsvtav1-1.5.0-compat-maximum_buffer_size_ms-conditional.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/96748ac54f998ba6fe22802799c16b4eba8d4ccc"; + hash = "sha256-Z5HSe7YpryYGHD3BYXejAhqR4EPnmfTGyccxNvU3AaU="; + } + ]; } From 32f663d5f5eaabdb3a9d225c8481287751ae7e5e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 1 May 2023 13:07:49 +0100 Subject: [PATCH 3/3] ffmpeg_4: add patch for svt-av1 1.5.0 compatibility --- pkgs/development/libraries/ffmpeg/4.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 7882c19da8f3..24b7aedb3ec2 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,4 +1,11 @@ import ./generic.nix rec { version = "4.4.3"; sha256 = "sha256-zZDzG1hD+0AHqElzeGR6OVm+H5wqtdktloSPmEUzT/c="; + extraPatches = [ + { + name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; + hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; + } + ]; }