Commit Graph

117 Commits

Author SHA1 Message Date
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
0bc377d47d
Merge pull request #63160 from basvandijk/opencv-4.1.0
opencv: 4.0.1 -> 4.1.0
2019-06-16 08:57:30 +02:00
Bas van Dijk
9f52f0e6b8 opencv: 3.4.5 -> 3.4.6 2019-06-15 16:54:31 +02:00
Bas van Dijk
baf54b6b8b opencv: 4.0.1 -> 4.1.0 2019-06-15 16:17:51 +02:00
Matthew Bauer
9a0ced7e45 opencv: disable QTKit backend
QTKit was removed in macOS 10.12
2019-06-06 01:00:40 -04:00
Matthew Bauer
50998c8475 opencv2: only works on linux
https://hydra.nixos.org/build/94234038
2019-06-05 23:45:27 -04:00
Jan Malakhovski
8e929441a9 opencv3, opencv4: move defaults to package file 2019-02-03 15:33:15 +00:00
Bas van Dijk
e36ab216ec opencv4: opencv_contrib: 4.0.0 -> 4.0.1 2018-12-24 23:37:12 +01:00
Bas van Dijk
8347028c21 opencv4: 4.0.0 -> 4.0.1 2018-12-22 17:26:12 +01:00
Bas van Dijk
b2ea557879 opencv3: 3.4.4 -> 3.4.5 2018-12-22 17:24:21 +01:00
Bas van Dijk
6267a02d9c opencv4: fix OpenCV issue 13207
This is the same fix as for opencv3 in commit:
2572dd11accf701feeefd6fd4ee45be98cb47016
2018-12-20 10:49:40 +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
274e72aa29
Merge pull request #51027 from LumiGuide/opencv-4.0.0
opencv4: init at 4.0.0
2018-11-30 23:56:36 +01:00
Bas van Dijk
aa358e6ee7 opencv3: 3.4.3 -> 3.4.4 2018-11-30 23:07:52 +01:00
Bas van Dijk
2b87ed7c32 opencv4: init at 4.0.0 2018-11-30 22:45:57 +01:00
Daiderd Jordan
14e41fe461
opencv: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _cvWaitKey in window_cocoa.mm.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in window_cocoa.mm.o
          objc-class-ref in cap_qtkit.mm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in window_cocoa.mm.o
          objc-class-ref in cap_qtkit.mm.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in window_cocoa.mm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in cap_qtkit.mm.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in cap_qtkit.mm.o
    ld: symbol(s) not found for architecture x86_64
2018-11-07 23:47:25 +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
Peter Simons
16517b81cd
Merge pull request #40286 from LumiGuide/opencv.pc
opencv3: fix $out/lib/pkgconfig/opencv.pc
2018-05-10 15:08:47 +02:00
Bas van Dijk
9938bb6c82 opencv3: fix $out/lib/pkgconfig/opencv.pc 2018-05-10 12:21:45 +02:00
Jan Tojnar
db78fe50e6
opencv: use GStreamer 1.0 2018-05-04 20:54:51 +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
Orivej Desh
42b71b220e
Merge pull request #33502 from acowley/opencv-darwin-ffmpeg
opencv3: fix enableFfmpeg on darwin
2018-01-06 04:15:23 +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
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01: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