BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #141961 from sbruder/vapoursynth-r57

Browse source 
vapoursynth: add fixes for API v4/R55+
This commit is contained in:
Michele Guerini Rocco 2021-10-20 08:36:29 +02:00 committed by GitHub
commit bb208438df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/libraries/vapoursynth/default.nix
View file

@ -2,21 +2,19 @@
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv , runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
, zimg, libass, python3, libiconv , zimg, libass, python3, libiconv
, ApplicationServices , ApplicationServices
, ocrSupport ? false, tesseract
, imwriSupport ? true, imagemagick
}: }:
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vapoursynth"; pname = "vapoursynth";
version = "R55"; version = "R57";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vapoursynth"; owner = "vapoursynth";
repo = "vapoursynth"; repo = "vapoursynth";
rev = version; rev = version;
sha256 = "sha256-91lPknNX3NM3NraIcPAR478paPoYvgjgCOIcdgaR5nE="; sha256 = "sha256-tPQ1SOIpFevOYzL9a8Lc5+dv2egVX1CY3km8yWVv+Sk=";
}; };
patches = [ patches = [
@ -27,14 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
zimg libass zimg libass
(python3.withPackages (ps: with ps; [ sphinx cython ])) (python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ];
++ optional ocrSupport tesseract
++ optional imwriSupport imagemagick;
configureFlags = [
(optionalString (!ocrSupport) "--disable-ocr")
(optionalString (!imwriSupport) "--disable-imwri")
];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -54,6 +45,10 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/vspipe \ wrapProgram $out/bin/vspipe \
--prefix PYTHONPATH : $out/${python3.sitePackages} --prefix PYTHONPATH : $out/${python3.sitePackages}
# VapourSynth does not include any plugins by default
# and emits a warning when the system plugin directory does not exist.
mkdir $out/lib/vapoursynth
''; '';
meta = with lib; { meta = with lib; {

12
pkgs/development/libraries/vapoursynth/editor.nix
View file

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand { lib, mkDerivation, fetchFromGitHub, makeWrapper, runCommand
, python3, vapoursynth , python3, vapoursynth
, qmake, qtbase, qtwebsockets , qmake, qtbase, qtwebsockets
}: }:
@ -6,13 +6,13 @@
let let
unwrapped = mkDerivation rec { unwrapped = mkDerivation rec {
pname = "vapoursynth-editor"; pname = "vapoursynth-editor";
version = "R19"; version = "R19-mod-4";
src = fetchFromBitbucket { src = fetchFromGitHub {
owner = "mystery_keeper"; owner = "YomikoR";
repo = pname; repo = pname;
rev = lib.toLower version; rev = lib.toLower version;
sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg=";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
@ -35,7 +35,7 @@ let
meta = with lib; { meta = with lib; {
description = "Cross-platform editor for VapourSynth scripts"; description = "Cross-platform editor for VapourSynth scripts";
homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; homepage = "https://github.com/YomikoR/VapourSynth-Editor";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ]; maintainers = with maintainers; [ tadeokondrak ];
platforms = platforms.all; platforms = platforms.all;