mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge pull request #29258 from rnhmjoj/vapour-fix
Vapoursynth: update and fix for GCC6
This commit is contained in:
commit
4f6f225f78
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vapoursynth-mvtools-${version}";
|
name = "vapoursynth-mvtools-${version}";
|
||||||
version = "17";
|
version = "19";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dubhater";
|
owner = "dubhater";
|
||||||
repo = "vapoursynth-mvtools";
|
repo = "vapoursynth-mvtools";
|
||||||
rev = "a2f5607420af8b8e76c0a6a06a517649bfa2c187";
|
rev = "v${version}";
|
||||||
sha256 = "06nq46jjyfpv74i27w2m6j64avs6shl99mk601m5h5mmdgm2mvcg";
|
sha256 = "1wjwf1lgfkqz87s0j251g625mw9xmx79zzgrjyhq3wlii73m6qwp";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -1,36 +1,39 @@
|
||||||
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
|
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
|
||||||
glibc, zimg, imagemagick, libass, yasm, python3,
|
zimg, libass, yasm, python3,
|
||||||
ocrSupport ? false, tesseract
|
ocrSupport ? false, tesseract,
|
||||||
|
imwriSupport? true, imagemagick7
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert ocrSupport -> tesseract != null;
|
assert ocrSupport -> tesseract != null;
|
||||||
|
assert imwriSupport -> imagemagick7 != null;
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vapoursynth-${version}";
|
name = "vapoursynth-${version}";
|
||||||
version = "R36";
|
version = "R38";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vapoursynth";
|
owner = "vapoursynth";
|
||||||
repo = "vapoursynth";
|
repo = "vapoursynth";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "10yiccj7yd4bd3a6k15xahb5y3ymcagyaqavh0wal2rwzfck9k8c";
|
sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig autoreconfHook
|
pkgconfig autoreconfHook
|
||||||
zimg imagemagick libass glibc tesseract yasm
|
zimg libass tesseract yasm
|
||||||
(python3.withPackages (ps: with ps; [ sphinx cython ]))
|
(python3.withPackages (ps: with ps; [ sphinx cython ]))
|
||||||
] ++ optional ocrSupport tesseract;
|
] ++ optional ocrSupport tesseract
|
||||||
|
++ optional imwriSupport imagemagick7;
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-imwri"
|
|
||||||
"--disable-static"
|
"--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";
|
description = "A video processing framework with the future in mind";
|
||||||
homepage = http://www.vapoursynth.com/;
|
homepage = http://www.vapoursynth.com/;
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21;
|
||||||
|
|
Loading…
Reference in a new issue