CVS commit: pkgsrc/graphics/opencv

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Wed Sep 26 19:33:50 UTC 2018

Modified Files:
        pkgsrc/graphics/opencv: Makefile distinfo
Added Files:
        pkgsrc/graphics/opencv/patches: patch-modules_python_src2_cv2.cpp

Log Message:
Fix opencv build with PYTHON_VERSION_DEFAULT=37


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/opencv/patches/patch-modules_python_src2_cv2.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.77 pkgsrc/graphics/opencv/Makefile:1.78
--- pkgsrc/graphics/opencv/Makefile:1.77        Mon Apr 16 14:34:39 2018
+++ pkgsrc/graphics/opencv/Makefile     Wed Sep 26 19:33:50 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2018/04/16 14:34:39 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2018/09/26 19:33:50 prlw1 Exp $
 
 DISTNAME=      opencv-3.4.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=opencv/}
 EXTRACT_SUFX=  .zip

Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.39 pkgsrc/graphics/opencv/distinfo:1.40
--- pkgsrc/graphics/opencv/distinfo:1.39        Fri Mar  2 16:24:21 2018
+++ pkgsrc/graphics/opencv/distinfo     Wed Sep 26 19:33:50 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2018/03/02 16:24:21 fhajny Exp $
+$NetBSD: distinfo,v 1.40 2018/09/26 19:33:50 prlw1 Exp $
 
 SHA1 (opencv-3.4.1.zip) = 1e2a04746eaeee520e58f81002c556c435ef0dce
 RMD160 (opencv-3.4.1.zip) = d9f6de36b3d43e0ec5ce7dcfe752a7529f1c4daa
@@ -11,5 +11,6 @@ SHA1 (patch-modules_core_include_opencv2
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471
 SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670598ac2d21071a617a5c33
+SHA1 (patch-modules_python_src2_cv2.cpp) = f9280bfe8e5b7154ce1ef75bf9da8020a5c7c666
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
 SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 985d91d9a4c63f081c3fff495cc86d8d0a1c6aa4

Added files:

Index: pkgsrc/graphics/opencv/patches/patch-modules_python_src2_cv2.cpp
diff -u /dev/null pkgsrc/graphics/opencv/patches/patch-modules_python_src2_cv2.cpp:1.1
--- /dev/null   Wed Sep 26 19:33:50 2018
+++ pkgsrc/graphics/opencv/patches/patch-modules_python_src2_cv2.cpp    Wed Sep 26 19:33:50 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_python_src2_cv2.cpp,v 1.1 2018/09/26 19:33:50 prlw1 Exp $
+
+Sprinkle const for python 3.7 compatibility
+
+--- modules/python/src2/cv2.cpp.orig   2018-02-23 08:38:33.000000000 +0000
++++ modules/python/src2/cv2.cpp
+@@ -886,7 +886,7 @@ bool pyopencv_to(PyObject* obj, String& 
+     (void)name;
+     if(!obj || obj == Py_None)
+         return true;
+-    char* str = PyString_AsString(obj);
++    const char* str = PyString_AsString(obj);
+     if(!str)
+         return false;
+     value = String(str);