public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/, media-libs/opencv/
Date: Sat, 10 Aug 2019 20:15:27 +0000 (UTC)	[thread overview]
Message-ID: <1565468091.f94b3d13ae8e6a49cea026ee62d70f2b07f9d2d7.alexxy@gentoo> (raw)

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() {


             reply	other threads:[~2019-08-10 20:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-10 20:15 Alexey Shvetsov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-26 19:49 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/, media-libs/opencv/ Andrew Ammerlaan
2024-01-10 12:41 Sam James
2024-01-03 21:28 Andreas Sturmlechner
2023-08-24 22:37 Sam James
2022-10-15  0:44 Sam James
2021-12-03  0:54 Sam James
2020-06-25 17:08 Andreas Sturmlechner
2019-12-07 19:39 Amy Liffey
2019-01-16 19:46 Amy Liffey
2019-01-14 22:23 Amy Liffey
2018-05-31 17:24 Amy Liffey
2018-05-25 19:26 Amy Liffey
2018-01-21  8:36 Amy Liffey
2017-07-27 18:54 Amy Liffey
2017-07-27 18:42 Amy Liffey
2016-09-27 14:22 Amy Winston
2016-06-09 13:54 Amy Winston
2016-04-07 17:39 Amy Winston
2016-02-25 13:35 Amy Winston

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1565468091.f94b3d13ae8e6a49cea026ee62d70f2b07f9d2d7.alexxy@gentoo \
    --to=alexxy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox