diff options
| author | joerg <joerg@pkgsrc.org> | 2013-05-06 14:48:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-05-06 14:48:22 +0000 |
| commit | 04b21331b788e574d717151ffcbb8b6ed60c8a2e (patch) | |
| tree | 9e7ba712a15459a26425f723115094b75b1f5729 /graphics | |
| parent | d672cd24899f893b37f5440177819b71c3b6677f (diff) | |
| download | pkgsrc-04b21331b788e574d717151ffcbb8b6ed60c8a2e.tar.gz | |
Add missing include. Require C++11 when building with Clang.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/opencv/Makefile | 7 | ||||
| -rw-r--r-- | graphics/opencv/distinfo | 3 | ||||
| -rw-r--r-- | graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp | 12 |
3 files changed, 20 insertions, 2 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 5a8a405b978..b267f630a22 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/02/16 11:22:18 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2013/05/06 14:48:22 joerg Exp $ DISTNAME= OpenCV-2.4.3 PKGNAME= ${DISTNAME:S/a$//:tl} @@ -33,6 +33,11 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* .include "options.mk" +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -std=c++11 +.endif + .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 76bcc4d84f8..4dba8a5bf98 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.18 2013/04/29 21:31:11 joerg Exp $ +$NetBSD: distinfo,v 1.19 2013/05/06 14:48:22 joerg Exp $ SHA1 (OpenCV-2.4.3.tar.bz2) = 982be2c3e52dfc3e9d14692c60bc856b2b766be2 RMD160 (OpenCV-2.4.3.tar.bz2) = b862ddd9e7fefd885d78835660a9f5c9320889c2 Size (OpenCV-2.4.3.tar.bz2) = 67240491 bytes +SHA1 (patch-modules_contrib_src_spinimages.cpp) = b3e465700059616be991d597230bc8dc42f15be1 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262 diff --git a/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp b/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp new file mode 100644 index 00000000000..8d9a31ff5bb --- /dev/null +++ b/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp @@ -0,0 +1,12 @@ +$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; |