seth 2024-08-25 22:19:40 -04:00
parent d38fc85b0d
commit ee8df28f48
No known key found for this signature in database
GPG Key ID: D31BD0D494BBEE86
3 changed files with 10 additions and 63 deletions

View File

@ -10,30 +10,24 @@
rav1e,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "av1an-unwrapped";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "master-of-zen";
repo = "av1an";
rev = version;
hash = "sha256-A4/1UdM8N5CHP44PBNB+ZH2Gcl84rcpUBwQRSnubBGc=";
rev = "refs/tags/${version}";
hash = "sha256-Mb5I+9IBwpfmK1w4LstNHI/qsJKlCuRxgSUiqpwUqF0=";
};
cargoPatches = [
# TODO: Remove next release
# Updates the `time` crate to work around
# https://github.com/NixOS/nixpkgs/issues/332957
./rust-1.80.0.patch
];
cargoHash = "sha256-Obq4oRXZ7IHDT+B9gKrVflq/FDzoN7ttZi8Aj2uOGxM=";
cargoHash = "sha256-IWcSaJoakXSPIdycWIikGSmOk+D4A3aMnJwuiKn8XNY=";
nativeBuildInputs = [
rustPlatform.bindgenHook
pkg-config
nasm
pkg-config
rustPlatform.bindgenHook
];
buildInputs = [
@ -57,7 +51,7 @@ rustPlatform.buildRustPackage rec {
It can increase your encoding speed and improve cpu utilization by running multiple encoder processes in parallel.
'';
homepage = "https://github.com/master-of-zen/Av1an";
changelog = "https://github.com/master-of-zen/Av1an/releases/tag/${src.rev}";
changelog = "https://github.com/master-of-zen/Av1an/releases/tag/${version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "av1an";

View File

@ -1,48 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index e5a1c65..b8cb96f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1008,6 +1008,12 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-derive"
version = "0.3.3"
@@ -1684,13 +1690,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.31"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa",
"libc",
+ "num-conv",
"num_threads",
"powerfmt",
"serde",
@@ -1706,10 +1713,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.16"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]

View File

@ -2,7 +2,6 @@
lib,
symlinkJoin,
makeBinaryWrapper,
testers,
av1an-unwrapped,
ffmpeg,
python3Packages,
@ -21,6 +20,7 @@
withX265 ? true, # H.265/HEVC encoder
withVmaf ? false, # Perceptual video quality assessment algorithm
}:
# av1an requires at least one encoder
assert lib.assertMsg (lib.elem true [
withAom
@ -30,6 +30,7 @@ assert lib.assertMsg (lib.elem true [
withX264
withX265
]) "At least one encoder is required!";
symlinkJoin {
name = "av1an-${av1an-unwrapped.version}";