Mon May 6 14:48:22 2013 UTC ()
Add missing include. Require C++11 when building with Clang.


(joerg)
diff -r1.34 -r1.35 pkgsrc/graphics/opencv/Makefile
diff -r1.18 -r1.19 pkgsrc/graphics/opencv/distinfo
diff -r0 -r1.1 pkgsrc/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp
cvs diff -r1.34 -r1.35 pkgsrc/graphics/opencv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/Makefile 2013/02/16 11:22:18 1.34
+++ pkgsrc/graphics/opencv/Makefile 2013/05/06 14:48:22 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.34 2013/02/16 11:22:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.35 2013/05/06 14:48:22 joerg Exp $
2 2
3DISTNAME= OpenCV-2.4.3 3DISTNAME= OpenCV-2.4.3
4PKGNAME= ${DISTNAME:S/a$//:tl} 4PKGNAME= ${DISTNAME:S/a$//:tl}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= graphics devel 6CATEGORIES= graphics devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= anthony.mallet@laas.fr 10MAINTAINER= anthony.mallet@laas.fr
11HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart 11HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart
12COMMENT= Library for computer vision problems 12COMMENT= Library for computer vision problems
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
@@ -23,23 +23,28 @@ INSTALLATION_DIRS+= share/doc/opencv/ref @@ -23,23 +23,28 @@ INSTALLATION_DIRS+= share/doc/opencv/ref
23INSTALLATION_DIRS+= share/OpenCV/haarcascades 23INSTALLATION_DIRS+= share/OpenCV/haarcascades
24 24
25PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in 25PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in
26 26
27REPLACE_PYTHON+= samples/python/*.py 27REPLACE_PYTHON+= samples/python/*.py
28 28
29WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//} 29WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//}
30 30
31# includes configure output and paths to gmake etc. 31# includes configure output and paths to gmake etc.
32CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* 32CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.*
33 33
34.include "options.mk" 34.include "options.mk"
35 35
 36.include "../../mk/compiler.mk"
 37.if !empty(PKGSRC_COMPILER:Mclang)
 38CXXFLAGS+= -std=c++11
 39.endif
 40
36.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
37.include "../../graphics/jasper/buildlink3.mk" 42.include "../../graphics/jasper/buildlink3.mk"
38.include "../../graphics/openexr/buildlink3.mk" 43.include "../../graphics/openexr/buildlink3.mk"
39.include "../../graphics/png/buildlink3.mk" 44.include "../../graphics/png/buildlink3.mk"
40.include "../../graphics/tiff/buildlink3.mk" 45.include "../../graphics/tiff/buildlink3.mk"
41.if ${OPSYS} != "Darwin" 46.if ${OPSYS} != "Darwin"
42.include "../../x11/gtk2/buildlink3.mk" 47.include "../../x11/gtk2/buildlink3.mk"
43.endif 48.endif
44.include "../../mk/jpeg.buildlink3.mk" 49.include "../../mk/jpeg.buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/graphics/opencv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/distinfo 2013/04/29 21:31:11 1.18
+++ pkgsrc/graphics/opencv/distinfo 2013/05/06 14:48:22 1.19
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.18 2013/04/29 21:31:11 joerg Exp $ 1$NetBSD: distinfo,v 1.19 2013/05/06 14:48:22 joerg Exp $
2 2
3SHA1 (OpenCV-2.4.3.tar.bz2) = 982be2c3e52dfc3e9d14692c60bc856b2b766be2 3SHA1 (OpenCV-2.4.3.tar.bz2) = 982be2c3e52dfc3e9d14692c60bc856b2b766be2
4RMD160 (OpenCV-2.4.3.tar.bz2) = b862ddd9e7fefd885d78835660a9f5c9320889c2 4RMD160 (OpenCV-2.4.3.tar.bz2) = b862ddd9e7fefd885d78835660a9f5c9320889c2
5Size (OpenCV-2.4.3.tar.bz2) = 67240491 bytes 5Size (OpenCV-2.4.3.tar.bz2) = 67240491 bytes
 6SHA1 (patch-modules_contrib_src_spinimages.cpp) = b3e465700059616be991d597230bc8dc42f15be1
6SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e 7SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e
7SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 8SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
8SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262 9SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262
9SHA1 (patch-modules_ts_include_opencv2_ts_ts__perf.hpp) = 8a7f08b176cedec85fd613e715d7b12d666a3e45 10SHA1 (patch-modules_ts_include_opencv2_ts_ts__perf.hpp) = 8a7f08b176cedec85fd613e715d7b12d666a3e45
File Added: pkgsrc/graphics/opencv/patches/Attic/patch-modules_contrib_src_spinimages.cpp
$NetBSD: patch-modules_contrib_src_spinimages.cpp,v 1.1 2013/05/06 14:48:22 joerg Exp $

--- modules/contrib/src/spinimages.cpp.orig	2013-05-05 18:32:00.000000000 +0000
+++ modules/contrib/src/spinimages.cpp
@@ -46,6 +46,7 @@
 #include <functional>
 #include <fstream>
 #include <limits>
+#include <numeric>
 #include <set>
 
 using namespace cv;