From b8b50f7ff6a95470ab19080f6d4e2a5722c16d48 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 24 Aug 2020 04:20:00 +0000 Subject: [PATCH] vid-stab: 0.98b -> 1.1.0 --- .../libraries/vid-stab/default.nix | 27 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index e22396f8aa3..2921719e755 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake, openmp }: stdenv.mkDerivation rec { - pname = "vid-stab"; - version = "0.98b"; - - src = fetchurl { - url = "https://github.com/georgmartius/vid.stab/archive/release-${version}.tar.gz"; - sha256 = "09fh6xbd1f5xp3il3dpvr87skmnp2mm2hfmg4s9rvj4y8zvhn3sk"; + pname = "vid.stab"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "georgmartius"; + repo = pname; + rev = "v${version}"; + sha256 = "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38"; }; nativeBuildInputs = [ cmake ]; - + + buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ openmp ]; + meta = with stdenv.lib; { description = "Video stabilization library"; - homepage = "http://public.hronopik.de/vid.stab/"; - license = licenses.gpl2; + homepage = "http://public.hronopik.de/vid.stab/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; + platforms = platforms.all; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 694516f80a2..42c4cd62954 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15521,7 +15521,9 @@ in vcg = callPackage ../development/libraries/vcg { }; - vid-stab = callPackage ../development/libraries/vid-stab { }; + vid-stab = callPackage ../development/libraries/vid-stab { + inherit (llvmPackages) openmp; + }; vigra = callPackage ../development/libraries/vigra { };