Commit Graph

144 Commits

Author SHA1 Message Date
Thomas
c322b7cfce
opencv: fix python bindings (#106972)
Fixes partially broken Python bindings (#91791) by removing workaround (#26304) no longer needed in the 4.x series.
2020-12-16 19:12:29 -05:00
tbenst
39acab6358 opencv: allow other blas/lapack 2020-11-21 11:38:56 +01:00
Masanori Ogino
ce438bd471 opencv: unbreak 2.4.13.7
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2020-11-09 21:12:54 +09:00
Masanori Ogino
f1d3f6b2ca opencv: 2.4.13 -> 2.4.13.7
It updates the repository URL to opencv/opencv. opencv2, p2pvc and
pfstools are built without errors but not really tested.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2020-11-05 20:51:39 +09:00
WORLDofPEACE
34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Maximilian Bosch
5e68d203f3
opencv2: mark as broken
Current release is 4.x and the 2.x-series doesn't seem to be supported
anymore for a while.
2020-09-12 23:04:46 +02:00
Mario Rodas
1966a0a4e1 opencv: enable videoio on darwin 2020-09-10 00:00:00 -05:00
David Anderson
3a38cef8f9 jasper: remove, abandoned upstream.
Jasper has been marked insecure for a while, and upstream has not
been responsive to CVEs for over a year.

Fixes #55388.

Signed-off-by: David Anderson <dave@natulte.net>
2020-09-09 18:29:42 +00:00
Doron Behar
01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Bernardo Meurer
080c064d1d opencv4: 4.1.2 -> 4.3.0 2020-04-26 15:11:18 -07:00
Matthew Bauer
1c8aba8334 treewide: use blas and lapack
This makes packages use lapack and blas, which can wrap different
BLAS/LAPACK implementations.

treewide: cleanup from blas/lapack changes

A few issues in the original treewide:

- can’t assume blas64 is a bool
- unused commented code
2020-04-17 16:24:09 -05:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michael Lingelbach
dc1a15e7bd opencv4: Enable nvidia-optical-flow-sdk when building with cuda 2020-03-21 01:35:49 -07:00
Robin Gloster
313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Robin Gloster
ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
c0bw3b
a13779a779 opencv: disable jasper by default
jasper has many unfixed CVEs, upstream disable its use by default
https://github.com/opencv/opencv/issues/14058
2019-11-20 19:46:14 +01:00
Robert Scott
baa8892616 opencv3: 3.4.7 -> 3.4.8 (security)
addressing CVE-2019-14491, CVE-2019-14492 & CVE-2019-15939

all internal downloads are unchanged for this release
2019-11-06 13:20:15 +00:00
Robert Scott
d623837d64 opencv4: 4.1.0 -> 4.1.2 (security)
resolving CVE-2019-14491, CVE-2019-14492 & CVE-2019-15939

most internal downloads are unchanged except for "ade" which was bumped
from v0.1.1d to v0.1.1f between these releases
2019-11-02 17:00:59 +00:00
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
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Marek Mahut
589405a563 opencv: CVE-2019-14493 2019-08-23 20:36:31 +02: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
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