From cbb314acf6a649354aab6f0939bd74af1eb5fa1d Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 23 May 2026 14:23:54 +0700 Subject: [PATCH] metadata: fix build with ffmpeg 8.1 --- .../by-name/me/metadata/ffmpeg-next-8.1.patch | 71 +++++++++++++++++++ pkgs/by-name/me/metadata/package.nix | 7 +- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/me/metadata/ffmpeg-next-8.1.patch diff --git a/pkgs/by-name/me/metadata/ffmpeg-next-8.1.patch b/pkgs/by-name/me/metadata/ffmpeg-next-8.1.patch new file mode 100644 index 000000000000..d31eb0b14241 --- /dev/null +++ b/pkgs/by-name/me/metadata/ffmpeg-next-8.1.patch @@ -0,0 +1,71 @@ +diff --git a/Cargo.lock b/Cargo.lock +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -37,7 +37,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4f72209734318d0b619a5e0f5129918b848c416e122a3c4ce054e03cb87b726f" + dependencies = [ +- "bitflags 2.9.3", ++ "bitflags 2.11.1", + "cexpr", + "clang-sys", + "itertools", +@@ -57,9 +57,9 @@ + + [[package]] + name = "bitflags" +-version = "2.9.3" ++version = "2.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d" ++checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" + + [[package]] + name = "block-buffer" +@@ -204,20 +204,20 @@ + + [[package]] + name = "ffmpeg-next" +-version = "8.0.0" ++version = "8.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d658424d233cbd993a972dd73a66ca733acd12a494c68995c9ac32ae1fe65b40" ++checksum = "f7c4bd5ab1ac61f29c634df1175d350ded29cf74c3c6d4f7030431a5ae3c7d5d" + dependencies = [ +- "bitflags 2.9.3", ++ "bitflags 2.11.1", + "ffmpeg-sys-next", + "libc", + ] + + [[package]] + name = "ffmpeg-sys-next" +-version = "8.0.1" ++version = "8.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9bca20aa4ee774fe384c2490096c122b0b23cf524a9910add0686691003d797b" ++checksum = "a314bc0e022a33a99567ed4bd2576bd58ffd8fcff7891c29194cfecc26a62547" + dependencies = [ + "bindgen", + "cc", +@@ -606,7 +606,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" + dependencies = [ +- "bitflags 2.9.3", ++ "bitflags 2.11.1", + "errno", + "libc", + "linux-raw-sys", +diff --git a/Cargo.toml b/Cargo.toml +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -33,7 +33,7 @@ + serde_derive = "1.0.198" + + [dependencies.ffmpeg-next] +-version = "8.0.0" ++version = "8.1.0" + default-features = false + features = ["codec", "format"] + diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix index d967994cc6a1..8e3c75f30c07 100644 --- a/pkgs/by-name/me/metadata/package.nix +++ b/pkgs/by-name/me/metadata/package.nix @@ -20,7 +20,12 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-gDOYqPwrWUfUTCx+p+ZpwsP8XxUufDCGem/WzW5cQPc="; }; - cargoHash = "sha256-tUVaseaavm746sxaA2A3ua4ZxzoKSnRQ4rJRBeO9t1U="; + cargoPatches = [ + # bump ffmpeg-next 8.0.0 -> 8.1.0 for ffmpeg 8.1 enum variants + ./ffmpeg-next-8.1.patch + ]; + + cargoHash = "sha256-TgF88oaf6567Xk20TkqbtE+H+nEKTiUSyswvxvCNFVI="; nativeBuildInputs = [ pkg-config