diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 492830ac3f5d..a15119c1918f 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -36,8 +36,8 @@ let }; v9 = { - version = "9.0.1"; - hash = "sha256-9Vnryl9jSSXRfvt2jPsNp7vHWL0KYdWA29D2zDRAZ+0="; + version = "9.0.2"; + hash = "sha256-/c6cVfMSF6JJxCuJs58bxBlmBXDJ+jbnC4pELB97Qb0="; }; in diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 20b20be026d9..8aade9e5e194 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -471,15 +471,6 @@ stdenv.mkDerivation ( ++ optionals (lib.versionAtLeast version "5.1") [ ./nvccflags-cpp14.patch ] - ++ optionals (lib.versionAtLeast version "8.1.2") [ - # https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23825 (merged, but not backported to 8.1.x or 9.0.x) - # As git.ffmpeg.org deploys Anubis, we cannot fetch this patch reliably from there. - # So instead, we fetch it from Debian. - (fetchpatch2 { - url = "https://salsa.debian.org/multimedia-team/ffmpeg/-/raw/d52aea25bc9123bfaf61f7a7e5a0d9da01c8788d/debian/patches/0001-swscale-loongarch-fix-buffer-underflow-in-yuv2plane1.patch"; - hash = "sha256-QRkb7z4Btyd9ZgV/1hh6Fb87IhkygFgVDqQdloXKL6Q="; - }) - ] ++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.1.4") [ (fetchpatch2 { name = "unbreak-hardcoded-tables.patch";