JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,328 Commits 2 Branches 0 Tags 12 GiB
577c4f543b
Commit Graph

56 Commits

Author SHA1 Message Date
Matthew Bauer
d21afc0b29
opencv: supports darwin 2017-04-23 18:08:31 -05:00
Bas van Dijk
52d44b76c1 opencv: upgrade from 3.1.0 to 3.2.0 2017-01-24 14:24:05 +01:00
Bas van Dijk
f2afe922f4 opencv-3.1: make ippicv download URL consistent 
with the URL defined in:

  https://github.com/opencv/opencv/blob/3.1.0/3rdparty/ippicv/downloader.cmake
 2017-01-23 23:12:18 +01:00
Bas van Dijk
1853f174d1 opencv-3.1: get ippicv from the nix store 
If ippicv can't be found in the directory:

  3rdparty/ippicv/downloads/${platform}-${md5}

it will be downloaded instead. Commit 7fedbe7 accidentally swapped the
md5 with the sha256 causing ippicv to be downloaded each time opencv
gets build. This patch fixes that.
 2017-01-23 22:22:56 +01:00
risicle
6d455dd1f8 opencv 3.1.0: add patch fixing python use of FlannBasedMatcher.add (#21086) 
Patch is from https://github.com/opencv/opencv/pull/6009. Upstream doesn't
seem particularly enthusiastic about a 3.1.x point release, so who knows
when this fix would otherwise see the light of day.
 2016-12-29 17:23:29 +01:00
Matthew Daiter
d6f1081314 opencv3: pull patches only if necessary 2016-12-13 11:26:56 +01:00
Matthew Daiter
448d605f89 opencv3: adding myself as co-maintainer 2016-11-28 14:16:37 +01:00
viric
75d9dc8516 Merge pull request #20631 from mdaiter/opencv_upgrade 
opencv3: added CUDA 8.0 specific patches
 2016-11-28 14:06:33 +01:00
Matthew Daiter
f13f3e7f7a opencv3: added CUDA 8.0 specific patches 
opencv3: added informative comments
 2016-11-23 18:33:51 +01:00
Matthew Daiter
35032ef15f opencv3: added tab to make cflags aligned 2016-11-22 13:40:57 +01:00
Daniel Peebles
843cfd6741 Merge pull request #20329 from NeQuissimus/opencv3_ipp_sha256 
opencv3: Move IPP to use sha256
 2016-11-11 12:10:41 -05:00
Tim Steinbach
7fedbe7c98
opencv3: Move IPP to use sha256 2016-11-10 21:40:38 -05:00
Matthew Daiter
30c1ad5ca3 opencv3: added in extra flag for enabling cuda with dependencies 
opencv3: added in optional buildFlag for enabling cuda

opencv3: added CUDA enabling flags to cmakeFlags

opencv3: added CUDA-speicifc FAST_MATH flag for enabling CUDA-accelerated math functions

opencv3: change enableCUDA default to false

opencv:added in cuda-enabling functionality.
 2016-11-04 14:44:16 +01:00
Bas van Dijk
212a53d9ff opencv-3.x: link to ippicv before configuring 
Without this ippicv gets downloaded each time opencv is build.
 2016-10-22 18:49:20 +02:00
Tuomas Tynkkynen
0d9068b131 opencv: Fix pkgconfig file after multiple outputs 
It used to contain:
````
includedir_old=${prefix}/include/opencv
includedir_new=${prefix}/include
Cflags: -I${includedir_old} -I${includedir_new}
````

Should fix build of 'seeks' and some others.
 2016-10-21 01:40:42 +03:00
Eelco Dolstra
5cf9d386e0 opencv: Use multiple outputs and prevent runtime dependency on GCC 2016-10-02 19:22:02 +02:00
Eelco Dolstra
452afd1ed6 ilmbase: Use separate outputs 2016-09-01 18:57:43 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Nikolay Amiantov
20f770d1f4 opencv: propagate numpy dependency 2016-06-07 21:27:19 +03:00
Nikolay Amiantov
f362f8d223 opencv3: 3.0.0 -> 3.1.0 
Split feature flags; avoid bundled libraries.
 2016-06-07 17:31:36 +03:00
Nikolay Amiantov
cfc7dba1ce opencv: 2.4.11 -> 2.4.13 
Split feature flags; avoid bundled libraries.
 2016-06-07 17:31:35 +03:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster
5be387da19 opencv3: turn off format hardening 2016-02-12 14:15:00 +00:00
Robin Gloster
0b93c68eb1 opencv: turn off bindnow and relro hardening 2016-02-07 19:18:57 +00:00
Tobias Geerinckx-Rice
e1f555477c opencv_2_1: remove dead package 
Broken since 2013. Only used by qrdecode which suffered the same fate.

cc @viric
 2016-01-06 03:49:47 +01:00
Bjørn Forsman
d7a0becf37 opencv3: add enableContrib flag 
If true, enable the repository of extra modules for OpenCV.
Build tested.

Based on patch from Bas van Dijk <v.dijk.bas@gmail.com>.
 2015-09-14 11:10:13 +02:00
Bjørn Forsman
affcf2e030 opencv3: add enableIpp flag 
Intel Integrated Performance Primitives (IPP) speeds up parts of OpenCV
on Intel processors (and compatible). It increases the store path from
220 MiB to 300 MiB, so it defaults to off.

Original patch from Bas van Dijk <v.dijk.bas@gmail.com>.

I tried applying the same change to opencv(2.x). OpenCV 2.x didn't
automatically detect IPP, so I reverted the change.
 2015-09-14 11:10:13 +02:00
Bjørn Forsman
fe85ba5806 opencv3: unbreak build (set "-DWITH_IPP=OFF") 
OpenCV tries to download IPP itself at build time. That doesn't work
well with nix.
 2015-09-01 22:23:47 +02:00
Carles Pagès
b4ad13f667 opencv: add version 3.0 
Adding as a separate expression, as it is not api compatible with 2.x.
 2015-09-01 14:53:32 +02:00
Bjørn Forsman
ac613f0748 opencv: remove duplicated -DCMAKE_BUILD_TYPE=Release flag 
The standard builder already does this.
 2015-08-27 10:54:10 +02:00
Siddhanathan Shanmugam
56d533d2c9 opencv: update to 2.4.11 2015-04-05 21:24:37 -04:00
Vladimír Čunát
9c94c42af8 opencv: fix build on i686 by upstream patch 
CC maintainers @viric, @flosse, #5356.
 2014-12-25 16:52:39 +01:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Markus Kohlhase
ff7d9ae2f5 nixpkg: opencv 2.4.9 -> 2.4.10 2014-12-16 16:10:18 +01:00
Aristid Breitkreuz
a4e643a5fe opencv: update 2.4.7 -> 2.4.9 2014-09-17 21:18:54 +02:00
Eelco Dolstra
0b996d886b opencv: Enable fewer dependencies by default 
In particular, this prevents KDE from pulling in gfortran, numpy and
atlas. We don't want anything important depending on atlas because it
has a crazy non-deterministic build system.

http://hydra.nixos.org/build/12555947
 2014-07-22 13:36:00 +02:00
Nixpkgs Monitor
22b9ebd4f0 opencv: update from 2.4.5 to 2.4.7 2013-12-18 18:18:38 +02:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Lluís Batlle i Rossell
c48fe0fea6 opencv: update to 2.4.5 2013-05-13 09:18:27 +02:00
Rok Garbas
54d81f1b6b opencv: python bindings 2013-03-23 00:44:19 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Lluís Batlle i Rossell
36f78f6d5f opencv: update to 2.4.3 2012-12-11 13:47:41 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Lluís Batlle i Rossell
8686b20bec opencv: update from 2.4.1 to 2.4.2 2012-07-23 16:09:45 +02:00
Lluís Batlle i Rossell
d0bfd4b623 opencv: updating to 2.4.1. 
Let's hydra tell us if it breaks anything.
 2012-07-04 09:59:31 +02:00
Lluís Batlle i Rossell
cace272941 opencv 2.1: fixing the build 
Related to libpng versions, and the gcc change (ptrdiff_t vs std::ptrdiff_t)
 2012-07-02 20:18:48 +02:00
Ludovic Courtès
07b8c666f7 OpenCV: Add missing parameter. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29593
 2011-10-02 20:36:10 +00:00
Peter Simons
07a5a121fb synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
 2011-09-28 14:48:34 +00:00
Yury G. Kudryashov
449e03648a opencv-2.3.1a 
* pkgconfig and cmake are buildNativeInputs
* drop xineLib dependency. It was not used anyway.

svn path=/nixpkgs/trunk/; revision=29473
 2011-09-24 20:40:58 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
 2011-08-24 19:16:43 +00:00