From 0af1e870c8086bac3709e656a054e216a9805278 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 12 Dec 2025 19:46:06 +0100 Subject: [PATCH 1/5] ffmpeg: fix hardcoded tables the newly released patche versions of ffmpeg fail to compile with it enabled see: https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/21102 --- pkgs/development/libraries/ffmpeg/generic.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index a8dc55ce3f86..27054512f1f7 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -453,6 +453,11 @@ stdenv.mkDerivation ( ] ++ optionals (lib.versionAtLeast version "5.1") [ ./nvccflags-cpp14.patch + (fetchpatch2 { + name = "unbreak-hardcoded-tables.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1d47ae65bf6df91246cbe25c997b25947f7a4d1d"; + hash = ""; + }) ] ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ (fetchpatch2 { From e714623cd3ab2da8c25713f6da820f7880582048 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 12 Dec 2025 19:46:06 +0100 Subject: [PATCH 2/5] ffmpeg: remove lcevcdec patch from newer versions this patch is no longer needed on version 8.0.1w --- pkgs/development/libraries/ffmpeg/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 27054512f1f7..a9d52f33349c 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -490,6 +490,8 @@ stdenv.mkDerivation ( url = "https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/raw/a02c1a15706ea832c0d52a4d66be8fb29499801a/add-av_stream_get_first_dts-for-chromium.patch"; hash = "sha256-DbH6ieJwDwTjKOdQ04xvRcSLeeLP2Z2qEmqeo8HsPr4="; }) + ] + ++ optionals (lib.versionAtLeast version "7.1" && lib.versionOlder version "8.0") [ (fetchpatch2 { name = "lcevcdec-4.0.0-compat.patch"; url = "https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/fa23202cc7baab899894e8d22d82851a84967848.patch"; From ddf609ecdf7f95b8f54c90eef17b89c4d3f675c9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 12 Dec 2025 19:46:06 +0100 Subject: [PATCH 3/5] ffmpeg_6: 6.1.3 -> 6.1.4 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index fb761f6f7c7c..16dddee98a15 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -21,8 +21,8 @@ let }; v6 = { - version = "6.1.3"; - hash = "sha256-NQnPOfiNmurY+L9/B7eVQc2JpOi0jhv5g9kVWsTzpis="; + version = "6.1.4"; + hash = "sha256-hqLohRNkoy5jGlaNlCRVoPwwsW7TDgCX1OKsGIM6IYg="; }; v7 = { From 9064fd320ca959c413f1a09afd398a3aef4a184d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 12 Dec 2025 19:46:06 +0100 Subject: [PATCH 4/5] ffmpeg_7: 7.1.2 -> 7.1.3 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 16dddee98a15..f984dec57e1f 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -26,8 +26,8 @@ let }; v7 = { - version = "7.1.2"; - hash = "sha256-MF/0oSOhxGWuOu6Yat7O68iOvgZ+wKjpQ8zSkwpWXqQ="; + version = "7.1.3"; + hash = "sha256-1w4OSlz88D2pnZVXQcI4uyX+triNK0NXzlsyt7GGSLU="; }; v8 = { version = "8.0"; From f1ec69e0ddbef4f50d3cd567841a0adcfd001afe Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 12 Dec 2025 19:46:06 +0100 Subject: [PATCH 5/5] ffmpeg_8: 8.0 -> 8.0.1 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index f984dec57e1f..0e82e63014c1 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -30,8 +30,8 @@ let hash = "sha256-1w4OSlz88D2pnZVXQcI4uyX+triNK0NXzlsyt7GGSLU="; }; v8 = { - version = "8.0"; - hash = "sha256-okNZ1/m/thFAY3jK/GSV0+WZFnjrMr8uBPsOdH6Wq9E="; + version = "8.0.1"; + hash = "sha256-eA5fP/uZqF5+jDDt4tHArGqyt7zbrLZ21v+Lchr8OS8="; }; in diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index a9d52f33349c..cd1ce7f98961 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -456,7 +456,7 @@ stdenv.mkDerivation ( (fetchpatch2 { name = "unbreak-hardcoded-tables.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1d47ae65bf6df91246cbe25c997b25947f7a4d1d"; - hash = ""; + hash = "sha256-ulB5BujAkoRJ8VHou64Th3E94z6m+l6v9DpG7/9nYsM="; }) ] ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [