JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29258 from rnhmjoj/vapour-fix

Browse Source 
Vapoursynth: update and fix for GCC6
This commit is contained in:
Jörg Thalheim 2017-09-12 07:57:25 +01:00 committed by GitHub
commit 4f6f225f78
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/vapoursynth-mvtools/default.nix
View File

@ -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 = [

23
pkgs/development/libraries/vapoursynth/default.nix
View File

@ -1,36 +1,39 @@
{ 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;