mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Code Issues Wiki Activity
93952 commits 256 branches 124 tags 5.2 GiB
Commit graph

41 commits

Author SHA1 Message Date
Eelco Dolstra 5cf9d386e0 opencv: Use multiple outputs and prevent runtime dependency on GCC 2016-10-02 19:22:02 +02:00
Eelco Dolstra 452afd1ed6 ilmbase: Use separate outputs 2016-09-01 18:57:43 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Nikolay Amiantov 20f770d1f4 opencv: propagate numpy dependency 2016-06-07 21:27:19 +03:00
Nikolay Amiantov f362f8d223 opencv3: 3.0.0 -> 3.1.0 
Split feature flags; avoid bundled libraries.
 2016-06-07 17:31:36 +03:00
Nikolay Amiantov cfc7dba1ce opencv: 2.4.11 -> 2.4.13 
Split feature flags; avoid bundled libraries.
 2016-06-07 17:31:35 +03:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster 5be387da19 opencv3: turn off format hardening 2016-02-12 14:15:00 +00:00
Robin Gloster 0b93c68eb1 opencv: turn off bindnow and relro hardening 2016-02-07 19:18:57 +00:00
Tobias Geerinckx-Rice e1f555477c opencv_2_1: remove dead package 
Broken since 2013. Only used by qrdecode which suffered the same fate.

cc @viric
 2016-01-06 03:49:47 +01:00
Bjørn Forsman d7a0becf37 opencv3: add enableContrib flag 
If true, enable the repository of extra modules for OpenCV.
Build tested.

Based on patch from Bas van Dijk <v.dijk.bas@gmail.com>.
 2015-09-14 11:10:13 +02:00
Bjørn Forsman affcf2e030 opencv3: add enableIpp flag 
Intel Integrated Performance Primitives (IPP) speeds up parts of OpenCV
on Intel processors (and compatible). It increases the store path from
220 MiB to 300 MiB, so it defaults to off.

Original patch from Bas van Dijk <v.dijk.bas@gmail.com>.

I tried applying the same change to opencv(2.x). OpenCV 2.x didn't
automatically detect IPP, so I reverted the change.
 2015-09-14 11:10:13 +02:00
Bjørn Forsman fe85ba5806 opencv3: unbreak build (set "-DWITH_IPP=OFF") 
OpenCV tries to download IPP itself at build time. That doesn't work
well with nix.
 2015-09-01 22:23:47 +02:00
Carles Pagès b4ad13f667 opencv: add version 3.0 
Adding as a separate expression, as it is not api compatible with 2.x.
 2015-09-01 14:53:32 +02:00
Bjørn Forsman ac613f0748 opencv: remove duplicated -DCMAKE_BUILD_TYPE=Release flag 
The standard builder already does this.
 2015-08-27 10:54:10 +02:00
Siddhanathan Shanmugam 56d533d2c9 opencv: update to 2.4.11 2015-04-05 21:24:37 -04:00
Vladimír Čunát 9c94c42af8 opencv: fix build on i686 by upstream patch 
CC maintainers @viric, @flosse, #5356.
 2014-12-25 16:52:39 +01:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Markus Kohlhase ff7d9ae2f5 nixpkg: opencv 2.4.9 -> 2.4.10 2014-12-16 16:10:18 +01:00
Aristid Breitkreuz a4e643a5fe opencv: update 2.4.7 -> 2.4.9 2014-09-17 21:18:54 +02:00
Eelco Dolstra 0b996d886b opencv: Enable fewer dependencies by default 
In particular, this prevents KDE from pulling in gfortran, numpy and
atlas. We don't want anything important depending on atlas because it
has a crazy non-deterministic build system.

http://hydra.nixos.org/build/12555947
 2014-07-22 13:36:00 +02:00
Nixpkgs Monitor 22b9ebd4f0 opencv: update from 2.4.5 to 2.4.7 2013-12-18 18:18:38 +02:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Lluís Batlle i Rossell c48fe0fea6 opencv: update to 2.4.5 2013-05-13 09:18:27 +02:00
Rok Garbas 54d81f1b6b opencv: python bindings 2013-03-23 00:44:19 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Lluís Batlle i Rossell 36f78f6d5f opencv: update to 2.4.3 2012-12-11 13:47:41 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Lluís Batlle i Rossell 8686b20bec opencv: update from 2.4.1 to 2.4.2 2012-07-23 16:09:45 +02:00
Lluís Batlle i Rossell d0bfd4b623 opencv: updating to 2.4.1. 
Let's hydra tell us if it breaks anything.
 2012-07-04 09:59:31 +02:00
Lluís Batlle i Rossell cace272941 opencv 2.1: fixing the build 
Related to libpng versions, and the gcc change (ptrdiff_t vs std::ptrdiff_t)
 2012-07-02 20:18:48 +02:00
Ludovic Courtès 07b8c666f7 OpenCV: Add missing parameter. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29593
 2011-10-02 20:36:10 +00:00
Peter Simons 07a5a121fb synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
 2011-09-28 14:48:34 +00:00
Yury G. Kudryashov 449e03648a opencv-2.3.1a 
* pkgconfig and cmake are buildNativeInputs
* drop xineLib dependency. It was not used anyway.

svn path=/nixpkgs/trunk/; revision=29473
 2011-09-24 20:40:58 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
 2011-08-24 19:16:43 +00:00
Michael Raskin a12937570c Fixing libdecodeqr build by using previous OpenCV 
svn path=/nixpkgs/trunk/; revision=28169
 2011-08-05 16:13:20 +00:00
Lluís Batlle i Rossell d86570f94e Updating opencv. 
svn path=/nixpkgs/trunk/; revision=27841
 2011-07-20 13:24:26 +00:00
Michael Raskin f904e3c821 Brute-force fix; I cannot understand why GCC behaves in a complicated way, but there is a simple workaround 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24771
 2010-11-19 13:12:13 +00:00
Lluís Batlle i Rossell 4457134e10 Making hydra build opencv. 
svn path=/nixpkgs/trunk/; revision=22596
 2010-07-14 07:50:06 +00:00
Lluís Batlle i Rossell 71760b99a5 Fixing the opencv build. As it builds with cmake, it also benefits from 'stdenv2' 
to build properly.

svn path=/nixpkgs/trunk/; revision=21184
 2010-04-20 15:09:56 +00:00
Lluís Batlle i Rossell 20e75e0cf0 Fixing the gcc-wrapper, so it does not link when gcc is called with '-x 
something'.
It should not link at least for '-x c-header' and '-x c++-header', and maybe
link for '-x c' or '-x c++', but we expect noone will be linking using these
later strings.

Adding opencv, which required '-x c-header' working, and that's why I have
updated gcc wrapper.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19491
 2010-01-16 21:26:10 +00:00