[packages/opencv] - rel 6
arekm
arekm at pld-linux.org
Fri Jul 6 19:49:11 CEST 2018
commit 51573190a841c01f0376324c5137618ff162b406
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Jul 6 19:49:02 2018 +0200
- rel 6
build.patch | 11 +++++++++++
opencv.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/opencv.spec b/opencv.spec
index e99d742..814c69a 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -60,7 +60,7 @@ Summary: A library of programming functions mainly aimed at real time computer v
Summary(pl.UTF-8): Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym
Name: opencv
Version: 3.4.1
-Release: 5
+Release: 6
Epoch: 1
%if %{with unicap} || %{with xine}
License: GPL (enforced by used libraries), BSD (opencv itself)
@@ -103,6 +103,7 @@ Patch0: ix86-pause.patch
Patch1: %{name}-ximea.patch
Patch2: cplusplus.patch
Patch3: cmake-install-path.patch
+Patch4: build.patch
URL: http://www.opencv.org/
%{?with_pvapi:BuildRequires: AVT_GigE_SDK-devel}
%{?with_opencl:BuildRequires: OpenCL-devel}
@@ -330,6 +331,7 @@ Wiązania Pythona 3 do OpenCV.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
install -d build/{share/OpenCV/testdata/cv/face,downloads/xfeatures2d}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..6d0098e
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,11 @@
+--- opencv-3.4.1/modules/python/src2/cv2.cpp~ 2018-02-23 09:38:33.000000000 +0100
++++ opencv-3.4.1/modules/python/src2/cv2.cpp 2018-07-06 19:10:56.563061072 +0200
+@@ -886,7 +886,7 @@ bool pyopencv_to(PyObject* obj, String&
+ (void)name;
+ if(!obj || obj == Py_None)
+ return true;
+- char* str = PyString_AsString(obj);
++ char* str = (char *)PyString_AsString(obj);
+ if(!str)
+ return false;
+ value = String(str);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/51573190a841c01f0376324c5137618ff162b406
More information about the pld-cvs-commit
mailing list