Commit Graph

177 Commits

Author SHA1 Message Date
Ben Darwin
5a8562ac9f opencv4: unpin vtk 2023-02-04 12:04:17 -05:00
Ben Darwin
4095b8232c vtk, vtkWithQt5: bump from vtk_8 to vtk_9 2023-01-24 12:33:48 -05:00
Artturin
72c7d7c27e opencv4: add reverse deps to tests 2022-12-29 15:26:58 +02:00
Artturin
021eed6b75 opencv: 4.6.0 -> 4.7.0
https://github.com/opencv/opencv/releases/tag/4.7.0
2022-12-28 21:33:16 +02:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Yureka
d948d26a97
opencv3: 3.4.15 -> 3.4.18 2022-09-23 01:31:13 +02:00
Yureka
595ed0ec11 opencv: 4.5.4 -> 4.6.0 2022-09-21 13:08:28 +02:00
Robert Scott
cfca7fe857
Merge pull request #182893 from kevinmehall/opencv-openjpeg
opencv: Use OpenJPEG from nixpkgs instead of vendored copy
2022-07-27 21:55:50 +01:00
Kevin Mehall
b21e1b5d1a opencv: Use OpenJPEG from nixpkgs instead of vendored copy 2022-07-26 16:46:39 -07:00
Artturin
1bd8727a4c various: enable gobject-introspection when cross-compiling
and fix cross in some
2022-07-08 03:56:47 +03:00
Sandro
c0fb2f569f
Merge pull request #170271 from armeenm/opencv-remove-python2
opencv2: remove python2 option
2022-06-17 13:34:39 +02:00
Rick van Schijndel
aa9f72b92b opencv4: disable hdf5 for cross-compilation
This gets us as far as building opencv, but it doesn't completely build yet
2022-06-02 22:53:41 +02:00
Armeen Mahdian
9a73a65fc2 opencv2: remove python2 option 2022-04-25 10:00:19 -05:00
Robert Schütz
d5cceedbd1 python,pythonPackages: make aliases
Since aliases are disallowed in nixpkgs, this makes usage of Python 2
which is EOL more explicit.
2022-01-16 18:39:59 +00:00
Jonathan Ringer
cc091b950c python3Packages.opencv4: fix installation metadata 2022-01-07 13:38:06 -08:00
Thomas
fbab2e0927 opencv{3,4}: move cudatoolkit to propagatedBuildInputs 2021-11-01 16:34:18 -05:00
happysalada
3b225fa342 opencv: 4.5.2 -> 4.5.4 2021-10-27 16:58:32 +09:00
Vladimír Čunát
2d89598250
Merge #134546: opencv: fix OpenCL linkage for 4.x 2021-10-16 14:20:02 +02:00
Alyssa Ross
d69583c6c2 opencv2: don't build unfree libraries by default
In opencv 2.x, unfree libraries are built by default.  The package
should therefore have been marked as unfree, but wasn't.

I've disabled the non-free libraries by default, and added an option
to enable them.  There are three programs in Nixpkgs that depend on
opencv2: mathematica, pfstools, and p2pvc.  pfstools requires the
non-free libraries if it's built with opencv support, so I've disabled
opencv by default there and added an option to enable it.  p2pvc links
fine, so presumably doesn't need the non-free libraries.  I can't test
mathematica, so I'm just going to leave it alone.
2021-09-29 13:39:52 +00:00
Vladimír Čunát
4cd9e898cb
Merge #138353: opencv3: fix build (into staging-next) 2021-09-20 12:32:03 +02:00
Ryan Burns
ab1ec682ac opencv3: fix build 2021-09-17 18:51:54 -07:00
Mario Rodas
0e36c3bb19 opencv: fix build 2021-09-17 01:25:00 -05:00
Mike Purvis
eac9faf01b opencv3: 3.4.8 -> 3.4.15 2021-09-16 01:55:08 +00:00
Thomas
7dc28c88bc opencv: fix OpenCL linkage 2021-08-17 19:00:13 -05:00
Artturin
044fd194e4 opencv: update cuda_opt_flow.patch 2021-06-13 22:51:52 -07:00
Robert Schütz
242f2064f5 opencv2: use ffmpeg instead of ffmpeg_3 2021-05-17 13:00:34 +02:00
Robert Schütz
d8f202e83e opencv3: use ffmpeg instead of ffmpeg_3 2021-05-17 12:58:16 +02:00
Robert Schütz
c2161e94f8 opencv4: use ffmpeg instead of ffmpeg_3 2021-05-17 12:57:09 +02:00
Thiago Franco de Moraes
cab40572d7
opencv-4: 4.3.0 -> 4.5.2
- Updated to 4.5.2
- Removed glog from buildInputs because of this error on python-opencv:
```
python -c "import cv2"
/nix/store/slfzk1gk74nfx3ky2vpdf9nb7b8nvdf2-opencv-4.5.2/lib/libopencv_sfm.so.4.5: error: symbol lookup error: undefined symbol: _ZN6google21kLogSiteUninitializedE (fatal)
```
- Enabled ffmpeg and gstreamer to open more video formats
- nixpkg-fmt
2021-04-11 20:25:01 -03:00
Frederik Rietdijk
137fb57d98 opencv3: pythonPackages can be missing
when we do not need Python (default)
2021-03-25 11:18:05 +01:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
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