Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
This commit is contained in:
@@ -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
|
||||
@@ -1,27 +0,0 @@
|
||||
{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
|
||||
, pkgconfig, gstreamer }:
|
||||
|
||||
let v = "2.3.1a"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencv-${v}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
|
||||
sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk libjpeg libpng libtiff jasper ffmpeg gstreamer ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Open Computer Vision Library with more than 500 algorithms";
|
||||
homepage = http://opencv.willowgarage.com/;
|
||||
license = "BSD";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user