Commit graph

13 commits

Author SHA1 Message Date
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