[pkgsrc/trunk]: pkgsrc/graphics/opencv Avoid GS define from sys/regset.h on S...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e99ceeb093bc
branches:  trunk
changeset: 637236:e99ceeb093bc
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jul 24 17:16:02 2014 +0000

description:
Avoid GS define from sys/regset.h on SunOS.

diffstat:

 graphics/opencv/distinfo                               |   3 ++-
 graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r e9a8acc0f455 -r e99ceeb093bc graphics/opencv/distinfo
--- a/graphics/opencv/distinfo  Thu Jul 24 15:51:56 2014 +0000
+++ b/graphics/opencv/distinfo  Thu Jul 24 17:16:02 2014 +0000
@@ -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_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 -r e9a8acc0f455 -r e99ceeb093bc graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/opencv/patches/patch-modules_ocl_src_gftt.cpp    Thu Jul 24 17:16:02 2014 +0000
@@ -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)
+ {