Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ca449e93ea8c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f6f225f78c9
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 12, 2017

  1. vapoursynth: R36 -> R38

    @rnhmjoj
    rnhmjoj committed Sep 12, 2017
    Copy the full SHA
    3f96615 View commit details

  2. vapoursynth-mvtools: 17 -> 19

    @rnhmjoj
    rnhmjoj committed Sep 12, 2017
    Copy the full SHA
    a7eb2e0 View commit details

  3. Merge pull request #29258 from rnhmjoj/vapour-fix 

    Vapoursynth: update and fix for GCC6
    @Mic92
    Mic92 authored Sep 12, 2017
    Copy the full SHA
    4f6f225 View commit details
Showing with 16 additions and 13 deletions.
  1. +3 −3 pkgs/development/libraries/vapoursynth-mvtools/default.nix
  2. +13 −10 pkgs/development/libraries/vapoursynth/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/vapoursynth-mvtools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 13 additions & 10 deletions pkgs/development/libraries/vapoursynth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;