Merge pull request #274973 from marsam/update-libvmaf

libvmaf: 2.3.1 -> 3.0.0

authored by Mario Rodas and committed by GitHub dd7251cf 71c41d36

+29 -18
+29 -18
pkgs/development/libraries/libvmaf/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, nasm, xxd }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , ffmpeg-full 5 + , libaom 6 + , meson 7 + , nasm 8 + , ninja 9 + , testers 10 + , xxd 11 + }: 2 12 3 - stdenv.mkDerivation rec { 13 + stdenv.mkDerivation (finalAttrs: { 4 14 pname = "libvmaf"; 5 - version = "2.3.1"; 15 + version = "3.0.0"; 6 16 7 17 src = fetchFromGitHub { 8 18 owner = "netflix"; 9 19 repo = "vmaf"; 10 - rev = "v${version}"; 11 - sha256 = "sha256-TkMy2tEdG1FPPWfH/wPnVbs5kocqe4Y0jU4yvbiRZ9k="; 20 + rev = "v${finalAttrs.version}"; 21 + sha256 = "sha256-6mwU2so1YM2pyWkJbDHVl443GgWtQazbBv3gTMBq5NA="; 12 22 }; 13 23 14 - sourceRoot = "${src.name}/libvmaf"; 15 - 16 - patches = [ 17 - # Backport fix for non-Linux, non-Darwin platforms. 18 - (fetchpatch { 19 - url = "https://github.com/Netflix/vmaf/commit/f47640f9ffee9494571bd7c9622e353660c93fc4.patch"; 20 - stripLen = 1; 21 - sha256 = "rsTKuqp8VJG5DBDpixPke3LrdfjKzUO945i+iL0n7CY="; 22 - }) 23 - ]; 24 + sourceRoot = "${finalAttrs.src.name}/libvmaf"; 24 25 25 26 nativeBuildInputs = [ meson ninja nasm xxd ]; 26 27 ··· 29 30 outputs = [ "out" "dev" ]; 30 31 doCheck = false; 31 32 33 + passthru.tests = { 34 + inherit libaom ffmpeg-full; 35 + version = testers.testVersion { 36 + package = finalAttrs.finalPackage; 37 + }; 38 + pkg-config = testers.hasPkgConfigModules { 39 + package = finalAttrs.finalPackage; 40 + moduleNames = [ "libvmaf" ]; 41 + }; 42 + }; 43 + 32 44 meta = with lib; { 33 45 description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; 34 46 homepage = "https://github.com/Netflix/vmaf"; 35 - changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md"; 47 + changelog = "https://github.com/Netflix/vmaf/blob/v${finalAttrs.version}/CHANGELOG.md"; 36 48 license = licenses.bsd2Patent; 37 49 maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; 38 50 mainProgram = "vmaf"; 39 51 platforms = platforms.unix; 40 52 }; 41 - 42 - } 53 + })