From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1104945-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B405E138334
for <garchives@archives.gentoo.org>; Sat, 10 Aug 2019 20:15:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D539BE0843;
Sat, 10 Aug 2019 20:15:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id ADC0BE0843
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2019 20:15:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 240E934986D
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2019 20:15:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 38A00471
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2019 20:15:27 +0000 (UTC)
From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" <alexxy@gentoo.org>
Message-ID: <1565468091.f94b3d13ae8e6a49cea026ee62d70f2b07f9d2d7.alexxy@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/, media-libs/opencv/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/opencv/files/opencv-3.4.1-python37.patch media-libs/opencv/opencv-3.4.1-r6.ebuild
X-VCS-Directories: media-libs/opencv/files/ media-libs/opencv/
X-VCS-Committer: alexxy
X-VCS-Committer-Name: Alexey Shvetsov
X-VCS-Revision: f94b3d13ae8e6a49cea026ee62d70f2b07f9d2d7
X-VCS-Branch: master
Date: Sat, 10 Aug 2019 20:15:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c6c7b208-5694-4a02-8b35-6efd7a487036
X-Archives-Hash: f8315772b83f8311e8eff0eabd3d45b0
commit: f94b3d13ae8e6a49cea026ee62d70f2b07f9d2d7
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 20:13:38 2019 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 20:14:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94b3d13
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 <AT> gentoo.org>
media-libs/opencv/files/opencv-3.4.1-python37.patch | 12 ++++++++++++
media-libs/opencv/opencv-3.4.1-r6.ebuild | 1 +
2 files changed, 13 insertions(+)
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
index 00000000000..94d307b748c
--- /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 2fdf2cd1f98..1f5783f9621 100644
--- 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() {