openmvs: init at current master (#25672)

* openmvs: init at current master

* openmvs: simplify expression

* openmvs: init at unstable-2017-05-01

authored by Matthew Daiter and committed by Jörg Thalheim 093130f8 c9f8fb4d

+55 -6
+45
pkgs/applications/science/misc/openmvs/default.nix
··· 1 + { lib, stdenv, fetchFromGitHub, pkgconfig, cmake 2 + , eigen, opencv, ceres-solver, cgal, boost, vcg 3 + , gmp, mpfr, glog, google-gflags, libjpeg_turbo }: 4 + 5 + stdenv.mkDerivation rec { 6 + name = "openmvs-unstable-2017-05-01"; 7 + 8 + src = fetchFromGitHub { 9 + owner = "cdcseacave"; 10 + repo = "openmvs"; 11 + 12 + rev = "a3b360016660a1397f6eb6c070c2c19bbb4c7590"; 13 + sha256 = "170ff4ipix2kqq5rhb1yrrcvc79im9qgp5hiwsdr23xxzdl21221"; 14 + }; 15 + 16 + buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; 17 + 18 + nativeBuildInputs = [ cmake pkgconfig ]; 19 + 20 + preConfigure = '' 21 + cmakeFlagsArray=( 22 + $cmakeFlagsArray 23 + "-DCMAKE_CXX_FLAGS=-std=c++11" 24 + "-DBUILD_SHARED_LIBS=ON" 25 + "-DBUILD_STATIC_RUNTIME=ON" 26 + "-DINSTALL_BIN_DIR=$out/bin" 27 + "-DVCG_DIR=${vcg}" 28 + "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/" 29 + ) 30 + ''; 31 + 32 + cmakeDir = "./"; 33 + 34 + dontUseCmakeBuildDir = true; 35 + 36 + enableParallelBuilding = true; 37 + 38 + meta = with stdenv.lib; { 39 + description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; 40 + homepage = http://cdcseacave.github.io/openMVS/; 41 + license = licenses.agpl3; 42 + platforms = platforms.linux; 43 + maintainers = with maintainers; [ mdaiter ]; 44 + }; 45 + }
+8 -6
pkgs/development/libraries/vcg/default.nix
··· 1 - { stdenv, fetchsvn, eigen }: 1 + { stdenv, fetchFromGitHub, eigen }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "vcg-2016-02-14"; 4 + name = "vcg-${version}"; 5 + version = "1.0.1"; 5 6 6 - src = fetchsvn { 7 - url = "svn://svn.code.sf.net/p/vcg/code/trunk/vcglib"; 8 - rev = 5688; 9 - sha256 = "0hkvz2d8prrjdcc7h0xhfd9hq86lmqg17ml045x4bkiciimx0w5s"; 7 + src = fetchFromGitHub { 8 + owner = "cnr-isti-vclab"; 9 + repo = "vcglib"; 10 + rev = "v${version}"; 11 + sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; 10 12 }; 11 13 12 14 propagatedBuildInputs = [ eigen ];
+2
pkgs/top-level/all-packages.nix
··· 3331 3331 3332 3332 openmvg = callPackage ../applications/science/misc/openmvg { }; 3333 3333 3334 + openmvs = callPackage ../applications/science/misc/openmvs { }; 3335 + 3334 3336 openntpd = callPackage ../tools/networking/openntpd { }; 3335 3337 3336 3338 openntpd_nixos = openntpd.override {