From cfc7dba1ce414bac8e42a5da90d3802bbf299eed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 7 Jun 2016 17:08:20 +0300
Subject: [PATCH] opencv: 2.4.11 -> 2.4.13
Split feature flags; avoid bundled libraries.
---
pkgs/development/libraries/opencv/default.nix | 59 +++++++++++++++----
1 file changed, 48 insertions(+), 11 deletions(-)
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 4ce1787dbac6..82d597a17c9a 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,25 +1,62 @@
-{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
-, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
-, enableBloat ? false }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unzip
+, zlib
+, enablePython ? false, pythonPackages
+, enableGtk2 ? false, gtk2
+, enableJPEG ? true, libjpeg
+, enablePNG ? true, libpng
+, enableTIFF ? true, libtiff
+, enableEXR ? true, openexr, ilmbase
+, enableJPEG2K ? true, jasper
+, enableFfmpeg ? false, ffmpeg
+, enableGStreamer ? false, gst_all
+, enableEigen ? false, eigen
+}:
-let v = "2.4.11"; in
+let
+ opencvFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}";
+
+in
stdenv.mkDerivation rec {
- name = "opencv-${v}";
+ name = "opencv-${version}";
+ version = "2.4.13";
- src = fetchurl {
- url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip";
- sha256 = "1shz5g7ahvbb41gprxzvavllf235qhx0fpkjd7iwa3gv83ym46dg";
+ src = fetchFromGitHub {
+ owner = "Itseez";
+ repo = "opencv";
+ rev = version;
+ sha256 = "1k29rxlvrhgc5hadg2nc50wa3d2ls9ndp373257p756a0aividxh";
};
buildInputs =
- [ unzip libjpeg libpng libtiff ]
- ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];
+ [ zlib ]
+ ++ lib.optional enableGtk2 gtk2
+ ++ lib.optional enableJPEG libjpeg
+ ++ lib.optional enablePNG libpng
+ ++ lib.optional enableTIFF libtiff
+ ++ lib.optionals enableEXR [ openexr ilmbase ]
+ ++ lib.optional enableJPEG2K jasper
+ ++ lib.optional enableFfmpeg ffmpeg
+ ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ])
+ ++ lib.optional enableEigen eigen
+ ;
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig unzip ];
+
+ NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR";
+
+ cmakeFlags = [
+ (opencvFlag "TIFF" enableTIFF)
+ (opencvFlag "JASPER" enableJPEG2K)
+ (opencvFlag "JPEG" enableJPEG)
+ (opencvFlag "PNG" enablePNG)
+ (opencvFlag "OPENEXR" enableEXR)
+ ];
enableParallelBuilding = true;
+ passthru = lib.optionalAttrs enablePython { pythonPath = []; };
+
meta = {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = http://opencv.org/;