mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues Wiki Activity
143807 commits 233 branches 124 tags 7 GiB
Commit graph

92 commits

Author SHA1 Message Date
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
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
Matthew Bauer d21afc0b29
opencv: supports darwin 2017-04-23 18:08:31 -05: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