Author: raskin
Date: Fri Nov 19 13:12:13 2010
New Revision: 24771
URL: https://svn.nixos.org/websvn/nix/?rev=24771&sc=1
Log:
Brute-force fix; I cannot understand why GCC behaves in a complicated way, but
there is a simple workaround
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/opencv/changeset_r3190.diff
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/opencv/default.nix
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/opencv/changeset_r3190.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/opencv/changeset_r3190.diff
Fri Nov 19 13:12:13 2010 (r24771)
@@ -0,0 +1,20 @@
+--- 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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/opencv/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/opencv/default.nix
Fri Nov 19 13:05:39 2010 (r24770)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/opencv/default.nix
Fri Nov 19 13:12:13 2010 (r24771)
@@ -12,6 +12,8 @@
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
xineLib gstreamer ];
+ patches = [ ./changeset_r3190.diff ];
+
meta = {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = http://opencv.willowgarage.com/;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
