nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-22 05:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
125,000 Commits 206 Branches 125 Tags 8.2 GiB
72a76fe8c3
Commit Graph

43 Commits

Author SHA1 Message Date
Bas van Dijk
72a76fe8c3 opencv: fix build of the videoio module on darwin 2018-01-09 00:46:35 +00:00
Bas van Dijk
13639d24ef opencv: support optional unfree algorithms 2018-01-09 00:46:35 +00:00
Bas van Dijk
81acfbfb9f opencv: use system protobuf compiler 2018-01-09 00:46:34 +00:00
Bas van Dijk
965e5c24d6 opencv: 3.3.1 -> 3.4.0 2018-01-09 00:46:34 +00:00
Anthony Cowley
8e84172b2d opencv3: fix enableFfmpeg on darwin 
The VideoDecodeAcceleration framework and bzip2 library are needed
when enableFfmpeg is set to true on darwin.
 2018-01-05 20:32:04 -05:00
Bas van Dijk
929d3d43e2 opencv: 3.3.0 -> 3.3.1 2017-11-05 23:54:20 +01:00
Bas van Dijk
4663bfa40e opencv: 3.2.0 -> 3.3.0 
Release notes: https://opencv.org/opencv-3-3.html

The contrib module cnn_3dobj is disabled because it fails to build.

The contrib module dnn_modern is disabled because it causes:
https://github.com/opencv/opencv_contrib/issues/823
 2017-10-24 12:56:39 +02:00
Nikolay Amiantov
59f51eba29 opencv3: use older cudatoolkit 2017-10-19 12:47:56 +03:00
Nikolay Amiantov
378bfba023 treewide: use default compiler for cuda 2017-10-19 12:47:30 +03:00
Nikolay Amiantov
7bf191337e opencv: use BLAS and eigen by default 
Gives a performance boost.
 2017-10-16 03:39:35 +03:00
Nikolay Amiantov
6f7b62e038 protobuf: default to 3.4 2017-09-08 03:40:56 +03:00
Joachim F
16f69139f7 Merge pull request #27011 from Hodapp87/opencv_tesseract 
opencv: Add optional Tesseract support
 2017-08-14 14:23:31 +00:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS" 
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
 2017-08-07 21:41:30 +02:00
Chris Hodapp
c27f692de6 opencv: Add optional Tesseract support 2017-08-01 07:21:51 -04:00
Chris Hodapp
70bbd5e84a opencv: Work around build failure with enableContrib & Python 2017-07-26 21:03:51 -04:00
Julien Dehos
0eb34ac754 opencv: add openblas support 2017-06-20 14:59:30 +02:00
Bas van Dijk
2265f50a51 opencv-3.x: fix build on OS X 2017-06-17 19:57:39 +02:00
mingchuan
b496ffbe55 opencv: Fix OpenCV build on non NixOS platform 
OpenCV's CMakeFile will use libraries in /lib and /lib64 if it can
find libraries from those paths. However, it causes
build failure because nix detects impure paths being used.
 2017-05-16 05:02:00 +08:00
Markus Kohlhase
344f1ee374 opencv: remove myself (flosse) from the maintainers list 2017-05-10 11:10:10 +02:00
Josef Kemetmueller
68c6e5bc8b opencv3: Enable darwin build 2017-05-04 22:50:03 +02: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
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
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
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