From d86570f94e5a9a93054eeeced92325dd01574424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 20 Jul 2011 13:24:26 +0000
Subject: [PATCH] Updating opencv.

svn path=/nixpkgs/trunk/; revision=27841
---
 .../libraries/opencv/changeset_r3190.diff     | 20 -------------------
 pkgs/development/libraries/opencv/default.nix |  8 ++++----
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/opencv/changeset_r3190.diff

diff --git a/pkgs/development/libraries/opencv/changeset_r3190.diff b/pkgs/development/libraries/opencv/changeset_r3190.diff
deleted file mode 100644
index 4a614659e72..00000000000
--- a/pkgs/development/libraries/opencv/changeset_r3190.diff
+++ /dev/null
@@ -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
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index c8b77d5f572..95a8f0d8fdb 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -2,17 +2,17 @@
   xineLib, gstreamer }:
 
 stdenv.mkDerivation rec {
-  name = "opencv-2.1.0";
+  name = "opencv-2.3.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
-    sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6";
+    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2";
+    sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw";
   };
 
   buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
     xineLib gstreamer ];
 
-  patches = [ ./changeset_r3190.diff ];
+  enableParallelBuilding = true;
 
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";