diff options
| author | rumko <rumko> | 2015-07-28 16:43:25 +0000 |
|---|---|---|
| committer | rumko <rumko> | 2015-07-28 16:43:25 +0000 |
| commit | 5f23213ad5d7c2afdfd02fbab8b00be126dbafb6 (patch) | |
| tree | 6bd8f8eca97c943a83573cf113924805c14af02a /graphics | |
| parent | 7510605ffd784157dbbffcbb6ad8c2e1ba7b07a2 (diff) | |
| download | pkgsrc-5f23213ad5d7c2afdfd02fbab8b00be126dbafb6.tar.gz | |
graphics/opencv: fix build on fbsd + clang
* under clang, C-style cast from nullptr_t to enum are not allowed.
Ok@ wiz
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/opencv/distinfo | 3 | ||||
| -rw-r--r-- | graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 5cf558fb1c2..6b5e39b3f95 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2015/02/26 17:52:12 tnn Exp $ +$NetBSD: distinfo,v 1.29 2015/07/28 16:43:25 rumko Exp $ SHA1 (opencv-2.4.9.zip) = 4f5166e2bd22bd6167cb56dd04f2c6ed68148b2c RMD160 (opencv-2.4.9.zip) = 1b0b80ecb50270fa7e4b1dea6f075982b5d15d81 @@ -11,4 +11,5 @@ SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33 SHA1 (patch-modules_legacy_src_calibfilter.cpp) = a388e646cd0b09af1b9ad4844f1097855808f316 SHA1 (patch-modules_ocl_src_gftt.cpp) = fe1107c1613881d050ec5a87fad12b916ac8b8fc +SHA1 (patch-modules_python_src2_cv2.cv.hpp) = 477bc2dd2090fd2aa955a7335717e7a0f23ebdf8 SHA1 (patch-modules_ts_src_ts.cpp) = 61e4ab59f2ca57f75212743bf869616dfc9e5f13 diff --git a/graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp b/graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp new file mode 100644 index 00000000000..0744c1faf48 --- /dev/null +++ b/graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp @@ -0,0 +1,16 @@ +$NetBSD: patch-modules_python_src2_cv2.cv.hpp,v 1.1 2015/07/28 16:43:25 rumko Exp $ + +Fix build under clang. +"error: C-style cast from 'nullprt_t' to 'CvNextEdgeType' is not allowed." + +--- modules/python/src2/cv2.cv.hpp.orig 2014-04-11 10:15:26.000000000 +0000 ++++ modules/python/src2/cv2.cv.hpp +@@ -2155,7 +2155,7 @@ static int convert_to_CvSubdiv2DPTR(PyOb + static int convert_to_CvNextEdgeType(PyObject *o, CvNextEdgeType *dst, const char *name = "no_name") + { + if (!PyInt_Check(o)) { +- *dst = (CvNextEdgeType)NULL; ++ *dst = (CvNextEdgeType)0; + return failmsg("Expected number for CvNextEdgeType argument '%s'", name); + } else { + *dst = (CvNextEdgeType)PyInt_AsLong(o); |