From 3f9661588ba94b7e9151a4b6c1becfe3d8424def Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 12 Sep 2017 04:10:32 +0200 Subject: [PATCH 1/2] vapoursynth: R36 -> R38 --- .../libraries/vapoursynth/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index ae43307cf31d..fde27e1cafa7 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,40 +1,43 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, - glibc, zimg, imagemagick, libass, yasm, python3, - ocrSupport ? false, tesseract + zimg, libass, yasm, python3, + ocrSupport ? false, tesseract, + imwriSupport? true, imagemagick7 }: -assert ocrSupport -> tesseract != null; +assert ocrSupport -> tesseract != null; +assert imwriSupport -> imagemagick7 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R36"; + version = "R38"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "10yiccj7yd4bd3a6k15xahb5y3ymcagyaqavh0wal2rwzfck9k8c"; + sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0"; }; buildInputs = [ pkgconfig autoreconfHook - zimg imagemagick libass glibc tesseract yasm + zimg libass tesseract yasm (python3.withPackages (ps: with ps; [ sphinx cython ])) - ] ++ optional ocrSupport tesseract; + ] ++ optional ocrSupport tesseract + ++ optional imwriSupport imagemagick7; configureFlags = [ - "--enable-imwri" "--disable-static" - (optionalString (!ocrSupport) "--disable-ocr") + (optionalString (!ocrSupport) "--disable-ocr") + (optionalString (!imwriSupport) "--disable-imwri") ]; - meta = { + meta = with stdenv.lib; { description = "A video processing framework with the future in mind"; - homepage = http://www.vapoursynth.com/; - license = licenses.lgpl21; - platforms = platforms.unix; + homepage = http://www.vapoursynth.com/; + license = licenses.lgpl21; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; From a7eb2e01bcada7ff6451c0ac05d3de4be8578322 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 12 Sep 2017 04:24:22 +0200 Subject: [PATCH 2/2] vapoursynth-mvtools: 17 -> 19 --- pkgs/development/libraries/vapoursynth-mvtools/default.nix | 6 +++--- pkgs/development/libraries/vapoursynth/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 8ae95bc942e5..1a1e70d89bc7 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "vapoursynth-mvtools-${version}"; - version = "17"; + version = "19"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; - rev = "a2f5607420af8b8e76c0a6a06a517649bfa2c187"; - sha256 = "06nq46jjyfpv74i27w2m6j64avs6shl99mk601m5h5mmdgm2mvcg"; + rev = "v${version}"; + sha256 = "1wjwf1lgfkqz87s0j251g625mw9xmx79zzgrjyhq3wlii73m6qwp"; }; buildInputs = [ diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index fde27e1cafa7..b37f28f868ea 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A video processing framework with the future in mind"; - homepage = http://www.vapoursynth.com/; - license = licenses.lgpl21; - platforms = platforms.unix; + homepage = http://www.vapoursynth.com/; + license = licenses.lgpl21; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; };