ffmpeg_6: 6.1.2 -> 6.1.3; ffmpeg_7: 7.1.1 -> 7.1.2 (#452038)

This commit is contained in:
Jo
2025-10-25 04:33:14 +00:00
committed by GitHub
2 changed files with 5 additions and 35 deletions

View File

@@ -21,13 +21,13 @@ let
}; };
v6 = { v6 = {
version = "6.1.2"; version = "6.1.3";
hash = "sha256-h/N56iKkAR5kH+PRQceWZvHe3k+70KWMDEP5iVq/YFQ="; hash = "sha256-NQnPOfiNmurY+L9/B7eVQc2JpOi0jhv5g9kVWsTzpis=";
}; };
v7 = { v7 = {
version = "7.1.1"; version = "7.1.2";
hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4="; hash = "sha256-MF/0oSOhxGWuOu6Yat7O68iOvgZ+wKjpQ8zSkwpWXqQ=";
}; };
v8 = { v8 = {
version = "8.0"; version = "8.0";

View File

@@ -460,36 +460,6 @@ stdenv.mkDerivation (
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475";
hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c="; hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c=";
}) })
(fetchpatch2 {
name = "CVE-2024-31582.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";
hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA=";
})
(fetchpatch2 {
name = "CVE-2024-31578.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7";
hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
})
(fetchpatch2 {
name = "CVE-2023-49501.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4adb93dff05dd947878c67784d98c9a4e13b57a7";
hash = "sha256-7cwktto3fPMDGvCZCVtB01X8Q9S/4V4bDLUICSNfGgw=";
})
(fetchpatch2 {
name = "CVE-2023-49502.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/737ede405b11a37fdd61d19cf25df296a0cb0b75";
hash = "sha256-mpSJwR9TX5ENjjCKvzuM/9e1Aj/AOiQW0+72oOMl9v8=";
})
(fetchpatch2 {
name = "CVE-2023-50007.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/b1942734c7cbcdc9034034373abcc9ecb9644c47";
hash = "sha256-v0hNcqBtm8GCGAU9UbRUCE0slodOjZCHrkS8e4TrVcQ=";
})
(fetchpatch2 {
name = "CVE-2023-50008.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b";
hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
})
] ]
++ optionals (lib.versionOlder version "7.1.1") [ ++ optionals (lib.versionOlder version "7.1.1") [
(fetchpatch2 { (fetchpatch2 {
@@ -520,7 +490,7 @@ stdenv.mkDerivation (
hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ="; hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ=";
}) })
] ]
++ optionals (lib.versionOlder version "7.2") [ ++ optionals (lib.versionOlder version "7.1.2") [
(fetchpatch2 { (fetchpatch2 {
name = "unbreak-svt-av1-3.0.0.patch"; name = "unbreak-svt-av1-3.0.0.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95";