media-libs/opencv: Fix py3.7 build

Follwoup to ac064acc48d43d7bfbf12c0985c5b0667454600b

Closes: https://bugs.gentoo.org/691480
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

diff --git a/media-libs/opencv/files/opencv-3.4.1-python37.patch b/media-libs/opencv/files/opencv-3.4.1-python37.patch
new file mode 100644 (file)
index 0000000..94d307b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-python37.patch
@@ -0,0 +1,12 @@
+diff -urN a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
+--- a/modules/python/src2/cv2.cpp      2018-02-23 11:38:33.000000000 +0300
++++ b/modules/python/src2/cv2.cpp      2019-08-10 22:28:03.337071791 +0300
+@@ -886,7 +886,7 @@
+     (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);

diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r6.ebuild
index 2fdf2cd1f98bf99cbc2c7b3b189e0f63ad30aa36..1f5783f962159c53b15f34faff29bdc573cc5212 100644 (file)
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild
@@ -236,6 +236,7 @@ PATCHES=(
        "${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576
        "${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
        "${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104
+       "${FILESDIR}/${P}-python37.patch" # https://bugs.gentoo.org/691480
 )
 
 pkg_pretend() {