From 3b9dc545a958f9fcbdb1d1a2ff617190fdc5d714 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Feb 2020 04:20:00 -0500 Subject: [PATCH 1/3] libvmaf: 1.3.15 -> 1.5.1 Changelog: https://github.com/Netflix/vmaf/releases/tag/v1.5.1 --- .../development/libraries/libvmaf/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 82c76f7ea37..321f5f70d2c 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,31 +1,26 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, intltool, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.3.15"; + version = "1.5.1"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256="10kgcdf06hzhbl5r7zsllq88bxbyn282hfqx5i3hkp66fpq896d2"; + sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3"; }; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; + sourceRoot = "source/libvmaf"; + + nativeBuildInputs = [ meson ninja ]; outputs = [ "out" "dev" ]; doCheck = true; - postFixup = '' - substituteInPlace "$dev/lib/pkgconfig/libvmaf.pc" \ - --replace "includedir=/usr/local/include" "includedir=$dev" - ''; - - makeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.cfsmp3 ]; }; From bd086255efa5186ef379f34670d7eacd416f0f63 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Feb 2020 04:21:00 -0500 Subject: [PATCH 2/3] libvmaf: add marsam to maintainers --- pkgs/development/libraries/libvmaf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 321f5f70d2c..fb494909c83 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.cfsmp3 ]; + maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; }; } From f1230a2ecadc56a861925ac8a240cc7fbbdbea57 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Feb 2020 04:22:00 -0500 Subject: [PATCH 3/3] ffmpeg: enable libvmaf on darwin --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e02b42d95a..c5446dbf568 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11376,7 +11376,6 @@ in frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; - libvmaf = if stdenv.isDarwin then null else libvmaf; libmodplug = if stdenv.isDarwin then null else libmodplug; openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk;