diff options
| author | jperkin <jperkin> | 2014-07-24 17:16:02 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-07-24 17:16:02 +0000 |
| commit | ee5512303375dde12b4b5ddf780a374fa56e7b24 (patch) | |
| tree | e01fc77bd0988f39c73c114d2a3b096b96f53184 /graphics | |
| parent | 9b134fa945c946c229a6ebdc7c7ddf253cf3f5ba (diff) | |
| download | pkgsrc-ee5512303375dde12b4b5ddf780a374fa56e7b24.tar.gz | |
Avoid GS define from sys/regset.h on SunOS.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/opencv/distinfo | 3 | ||||
| -rw-r--r-- | graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index aedcf147e7e..a9f46efa7fc 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2014/07/09 19:57:36 ryoon Exp $ +$NetBSD: distinfo,v 1.27 2014/07/24 17:16:02 jperkin Exp $ SHA1 (opencv-2.4.9.zip) = 4f5166e2bd22bd6167cb56dd04f2c6ed68148b2c RMD160 (opencv-2.4.9.zip) = 1b0b80ecb50270fa7e4b1dea6f075982b5d15d81 @@ -9,4 +9,5 @@ SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f2 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 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_ts_src_ts.cpp) = 61e4ab59f2ca57f75212743bf869616dfc9e5f13 diff --git a/graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp b/graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp new file mode 100644 index 00000000000..e79bebc95ac --- /dev/null +++ b/graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-modules_ocl_src_gftt.cpp,v 1.1 2014/07/24 17:16:02 jperkin Exp $ + +Avoid GS define from sys/regset.h on SunOS. + +--- modules/ocl/src/gftt.cpp.orig 2014-04-11 10:15:26.000000000 +0000 ++++ modules/ocl/src/gftt.cpp +@@ -69,6 +69,9 @@ struct DefCornerCompare + } + }; + ++#if defined(__sun) ++#undef GS ++#endif + // sort corner point using opencl bitonicosrt implementation + static void sortCorners_caller(oclMat& corners, const int count) + { |