| 1 |
commit: f94b3d13ae8e6a49cea026ee62d70f2b07f9d2d7 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 10 20:13:38 2019 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 10 20:14:51 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94b3d13 |
| 7 |
|
| 8 |
media-libs/opencv: Fix py3.7 build |
| 9 |
|
| 10 |
Follwoup to ac064acc48d43d7bfbf12c0985c5b0667454600b |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/691480 |
| 13 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 14 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
| 15 |
|
| 16 |
media-libs/opencv/files/opencv-3.4.1-python37.patch | 12 ++++++++++++ |
| 17 |
media-libs/opencv/opencv-3.4.1-r6.ebuild | 1 + |
| 18 |
2 files changed, 13 insertions(+) |
| 19 |
|
| 20 |
diff --git a/media-libs/opencv/files/opencv-3.4.1-python37.patch b/media-libs/opencv/files/opencv-3.4.1-python37.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..94d307b748c |
| 23 |
--- /dev/null |
| 24 |
+++ b/media-libs/opencv/files/opencv-3.4.1-python37.patch |
| 25 |
@@ -0,0 +1,12 @@ |
| 26 |
+diff -urN a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp |
| 27 |
+--- a/modules/python/src2/cv2.cpp 2018-02-23 11:38:33.000000000 +0300 |
| 28 |
++++ b/modules/python/src2/cv2.cpp 2019-08-10 22:28:03.337071791 +0300 |
| 29 |
+@@ -886,7 +886,7 @@ |
| 30 |
+ (void)name; |
| 31 |
+ if(!obj || obj == Py_None) |
| 32 |
+ return true; |
| 33 |
+- char* str = PyString_AsString(obj); |
| 34 |
++ const char* str = PyString_AsString(obj); |
| 35 |
+ if(!str) |
| 36 |
+ return false; |
| 37 |
+ value = String(str); |
| 38 |
|
| 39 |
diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r6.ebuild |
| 40 |
index 2fdf2cd1f98..1f5783f9621 100644 |
| 41 |
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild |
| 42 |
+++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild |
| 43 |
@@ -236,6 +236,7 @@ PATCHES=( |
| 44 |
"${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576 |
| 45 |
"${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900 |
| 46 |
"${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104 |
| 47 |
+ "${FILESDIR}/${P}-python37.patch" # https://bugs.gentoo.org/691480 |
| 48 |
) |
| 49 |
|
| 50 |
pkg_pretend() { |
Archives