ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Updating opencv.

Browse Source 
svn path=/nixpkgs/trunk/; revision=27841
This commit is contained in:
Lluís Batlle i Rossell 2011-07-20 13:24:26 +00:00
parent ff91dbdb35
commit d86570f94e
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/opencv/changeset_r3190.diff
View File

@ -1,20 +0,0 @@
--- opencv/src/highgui/cvcap_ffmpeg.cpp
+++ opencv/src/highgui/cvcap_ffmpeg.cpp
@@ -49,6 +49,15 @@
#if !defined(WIN32) || defined(__MINGW32__)
// some versions of FFMPEG assume a C99 compiler, and don't define INT64_C
-#ifndef INT64_C
-#define INT64_C
+#if !defined INT64_C || !defined UINT64_C
+# if __WORDSIZE == 64
+# define INT64_C(c) c ## UL
+# else
+# define INT64_C(c) c ## ULL
+# endif
+# if __WORDSIZE == 64
+# define UINT64_C(c) c ## UL
+# else
+# define UINT64_C(c) c ## ULL
+# endif
#define __STDC_CONSTANT_MACROS
// force re-inclusion of stdint.h to get INT64_C macro

8
pkgs/development/libraries/opencv/default.nix
View File

@ -2,17 +2,17 @@
xineLib, gstreamer }: xineLib, gstreamer }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opencv-2.1.0"; name = "opencv-2.3.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2"; url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2";
sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6"; sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw";
}; };
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
xineLib gstreamer ]; xineLib gstreamer ];
patches = [ ./changeset_r3190.diff ]; enableParallelBuilding = true;
meta = { meta = {
description = "Open Computer Vision Library with more than 500 algorithms"; description = "Open Computer Vision Library with more than 500 algorithms";