Frederik Rietdijk
98ef78326d
Merge staging-next into staging
2019-08-31 18:07:33 +02:00
Frederik Rietdijk
96e5474329
Merge master into staging-next
2019-08-31 18:04:31 +02:00
Averell Dalton
c4adeddb5f
opencv: dont try cuda on 32 bit
...
config.cudaSupport can be true and cudatoolkit doesn't work with i686,
which can happen inside pkgsi686Linux wrapping.
2019-08-31 15:55:18 +02:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
volth
46420bbaa3
treewide: name -> pname (easy cases) ( #66585 )
...
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
2019-08-15 13:41:18 +01:00
Orivej Desh
c5592fabba
opencv3: 3.4.6 -> 3.4.7
2019-07-26 23:47:10 +00:00
Orivej Desh
b5d1d50aa9
google-gflags: move to aliases.nix
...
google-gflags were renamed to gflags in 2012:
https://github.com/gflags/gflags/#25-january-2012
gflags.name will be updated in staging.
2019-07-25 09:18:32 +00:00
Daiderd Jordan
2f9a546b96
opencv: remove cf-private
2019-07-03 22:20:15 +02:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Bas van Dijk
9f52f0e6b8
opencv: 3.4.5 -> 3.4.6
2019-06-15 16:54:31 +02:00
Matthew Bauer
9a0ced7e45
opencv: disable QTKit backend
...
QTKit was removed in macOS 10.12
2019-06-06 01:00:40 -04:00
Jan Malakhovski
8e929441a9
opencv3, opencv4: move defaults to package file
2019-02-03 15:33:15 +00:00
Bas van Dijk
b2ea557879
opencv3: 3.4.4 -> 3.4.5
2018-12-22 17:24:21 +01:00
Bas van Dijk
49965e61d7
opencv3: fix OpenCV issue 13207
...
See: https://github.com/opencv/opencv/pull/13232
This also fixes the test of haskell-opencv HEAD where we got the
following error:
Feature Detection
houghLinesP:
libgomp: Out of memory allocating 927712937064 bytes
Test suite test-opencv: FAIL
2018-12-20 10:49:40 +01:00
Bas van Dijk
aa358e6ee7
opencv3: 3.4.3 -> 3.4.4
2018-11-30 23:07:52 +01:00
Eelco Dolstra
c8a2533516
opencv3: Reduce closure size from 520 to 154 MiB
2018-10-08 22:56:23 +02:00
Bas van Dijk
252c0d4c82
opencv: 3.4.2 -> 3.4.3
2018-09-03 12:38:50 +02:00
John Ericson
2c2f1e37d4
reewide: Purge all uses stdenv.system
and top-level system
...
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Lluís Batlle i Rossell
f54b387b63
Merge remote-tracking branch 'central/master' into viric_clean
2018-07-28 19:25:14 +02:00
Bas van Dijk
980674f08c
opencv: 3.4.1 -> 3.4.2
2018-07-27 16:13:21 +02:00
Lluís Batlle i Rossell
66d7126255
Take me (viric) out of most maintenance
...
Since years I'm not maintaining anything of the list below other
than some updates when I needed them for some reason. Other people
is doing that maintenance on my behalf so I better take me out but
for very few packages. Finally!
2018-07-22 21:50:19 +02:00
volth
52f53c69ce
pkgs/*: remove unreferenced function arguments
2018-07-21 02:48:04 +00:00
Bas van Dijk
9938bb6c82
opencv3: fix $out/lib/pkgconfig/opencv.pc
2018-05-10 12:21:45 +02:00
Pascal Bach
7ccbca6010
opencv3: don't download ippicv if not enabled
...
On aarch64 ipp is not available but the derivation still tries to download it
leading to an error that the platform is not supported.
There is already an option to enable ipp which is disabled by default.
So the sensitive thing to do is to only download the ippicv package if
the option is enabled.
This makes opencv3 build on aarch64.
2018-03-25 15:13:32 +02:00
Ryan Mulligan
b189247ba0
treewide: use more HTTPS URLs
...
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.
Also fixes jbake source URL, which was broken.
2018-03-24 22:04:25 -07:00
Joachim F
28b48fd8ef
Merge pull request #36170 from LumiGuide/feat-opencv-tbb
...
opencv: flag to enable tbb
2018-03-04 22:59:36 +00:00
Bas van Dijk
ca6f30da07
opencv: 3.4.0 -> 3.4.1
...
Changelog: https://github.com/opencv/opencv/wiki/ChangeLog#version341
2018-03-04 17:18:04 +00:00
Roel van Dijk
da134f8a8a
opencv: flag to enable tbb
...
enableTbb makes opencv use the "threading building blocks" library as
the parallel framework
2018-03-01 15:45:15 +01:00
Nikolay Amiantov
f6925dbdd8
opencv3: enable contrib by default
2018-02-25 22:24:10 +03:00
Nikolay Amiantov
a10c91d5ae
opencv3: fix compilation with CUDA support
2018-02-25 22:24:09 +03:00
Nikolay Amiantov
8711763d42
opencv3: fix openblas dependency
2018-02-25 22:24:09 +03:00
Nikolay Amiantov
24cc05e10a
opencv3: don't depend on caffe
...
It's needed only for tests (which we don't run) and creates a circular
dependency.
2018-02-25 22:24:09 +03:00
Bas van Dijk
9aad587cbb
opencv: have a better fix for the python bindings issue
2018-01-09 00:46:35 +00:00
Bas van Dijk
6919867b3b
opencv: disable dnn_modern on darwin
2018-01-09 00:46:35 +00:00
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