pool/opencv
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 541269 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/541269
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2017-11-19 10:08:51 +00:00 committed by Git OBS Bridge
parent 42cb4f5adf
commit 314d715c2b
7 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3.2.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35
size 78861546

3
opencv-3.3.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5dca3bb0d661af311e25a72b04a7e4c22c47c1aa86eb73e70063cd378a2aa6ee
size 85868197

8
opencv-build-compare.patch
View File

@ -1,5 +1,5 @@
--- opencv-3.2.0.orig/CMakeLists.txt 2017-05-28 15:04:38.466895124 +0200
+++ opencv-3.2.0/CMakeLists.txt 2017-05-28 15:05:23.251389916 +0200
--- opencv-3.3.0.orig/CMakeLists.txt 2017-05-28 15:04:38.466895124 +0200
+++ opencv-3.3.0/CMakeLists.txt 2017-05-28 15:05:23.251389916 +0200
@@ -843,11 +843,11 @@
status(" Timestamp:" ${TIMESTAMP})
endif()
@ -14,8 +14,8 @@
status(" CMake generator:" ${CMAKE_GENERATOR})
status(" CMake build tool:" ${CMAKE_BUILD_TOOL})
if(MSVC)
--- opencv-3.2.0.orig/cmake/OpenCVUtils.cmake 2016-12-23 13:54:44.000000000 +0100
+++ opencv-3.2.0/cmake/OpenCVUtils.cmake 2017-05-28 15:07:42.728928083 +0200
--- opencv-3.3.0.orig/cmake/OpenCVUtils.cmake 2016-12-23 13:54:44.000000000 +0100
+++ opencv-3.3.0/cmake/OpenCVUtils.cmake 2017-05-28 15:07:42.728928083 +0200
@@ -550,15 +550,18 @@
if(${status_cond})
string(REPLACE ";" " " status_then "${status_then}")

35
opencv-gcc6-fix-pch-support-PR8345.patch
View File

@ -1,35 +0,0 @@
From 583e3a68758f02060099994b1fd41b823ddc2bab Mon Sep 17 00:00:00 2001
From: Christof Kaufmann <christof.kaufmann@hs-bochum.de>
Date: Thu, 9 Mar 2017 16:13:46 +0100
Subject: [PATCH] cmake: Avoid adding default path as system directory for GCC
6.x
This is a completion for PR #7390 and fixes #6517 and #815.
---
cmake/OpenCVPCHSupport.cmake | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
index 29f21d80158..4f9be6d1556 100644
--- a/cmake/OpenCVPCHSupport.cmake
+++ b/cmake/OpenCVPCHSupport.cmake
@@ -65,6 +65,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
ocv_is_opencv_directory(__result ${item})
if(__result)
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"")
+ elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND
+ item MATCHES "/usr/include$")
+ # workaround for GCC 6.x bug
else()
LIST(APPEND ${_out_compile_flags} "${_PCH_isystem_prefix}\"${item}\"")
endif()
@@ -75,6 +78,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
ocv_is_opencv_directory(__result ${item})
if(__result)
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"")
+ elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND
+ item MATCHES "/usr/include$")
+ # workaround for GCC 6.x bug
else()
LIST(APPEND ${_out_compile_flags} "${_PCH_isystem_prefix}\"${item}\"")
endif()

12
opencv-gles.patch
View File

@ -1,12 +0,0 @@
--- opencv-3.1.0.orig/modules/highgui/src/window_QT.cpp 2015-12-18 16:02:16.000000000 +0100
+++ opencv-3.1.0/modules/highgui/src/window_QT.cpp 2016-02-26 22:31:37.004570651 +0100
@@ -3165,7 +3165,9 @@
void OpenGlViewPort::initializeGL()
{
+#ifdef GL_PERSPECTIVE_CORRECTION_HINT
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+#endif
}
void OpenGlViewPort::resizeGL(int w, int h)

38
opencv.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Mon Nov 13 09:21:35 UTC 2017 - mpluskal@suse.com
- Update licensing information
-------------------------------------------------------------------
Wed Nov 8 11:21:42 UTC 2017 - ecsos@opensuse.org
- change requires of python-numpy-devel to build in Leap and
to not break factory in future
-------------------------------------------------------------------
Sat Nov 4 10:42:02 UTC 2017 - ecsos@opensuse.org
- fix build error/unresolvable for Leap 42.2 and 42.3
-------------------------------------------------------------------
Fri Nov 3 08:34:20 UTC 2017 - mpluskal@suse.com
- Update to version 3.3.1:
* Lots of various bugfixes
- Update source url
-------------------------------------------------------------------
Thu Nov 2 15:06:21 UTC 2017 - mpluskal@suse.com
- Rename python subpackage to python2
- Do not explicitly require python-base for python subpackages
-------------------------------------------------------------------
Mon Oct 9 05:06:36 UTC 2017 - kah0922@gmail.com
- Update to 3.3
- Dropped obsolete patches
* opencv-gcc6-fix-pch-support-PR8345.patch
* opencv-gles.patch
- Updated opencv-build-compare.patch
-------------------------------------------------------------------
Sat Jul 15 19:14:48 UTC 2017 - stefan.bruens@rwth-aachen.de

32
opencv.spec
View File

@ -17,27 +17,24 @@
%define libname lib%{name}
%define soname 3_2
%define soname 3_3
# disabled by default as many fail
%bcond_with tests
%bcond_without qt5
%bcond_without ffmpeg
Name: opencv
Version: 3.2.0
Version: 3.3.1
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
# GPL-2.9 AND Apache-2.0 files are in 3rdparty/ittnotify which is not build
License: BSD-3-Clause AND GPL-2.0 AND Apache-2.0
Group: Development/Libraries/C and C++
Url: http://opencv.org/
Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
Source0: https://github.com/opencv/opencv/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# This is the FACE module from the opencv_contrib package. Packaged separately to prevent too much usntable modules
Source1: opencv_contrib_face-3.1.0.tar.bz2
# PATCH-FIX-UPSTREAM opencv-gles.patch -- Make sure PERSPECTIVE_CORRECTION_HINT is validated first
Patch1: opencv-gles.patch
# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes
Patch8: opencv-build-compare.patch
# PATCH-FIX-UPSTREAM opencv-gcc6-fix-pch-support-PR8345.patch -- fix PCH support on GCC 6.x
Patch10: opencv-gcc6-fix-pch-support-PR8345.patch
# PATCH-FIX-OPENSUSE 0001-Do-not-include-glx.h-when-using-GLES.patch -- Fix build error on 32bit ARM, due to incompatible pointer types
Patch11: 0001-Do-not-include-glx.h-when-using-GLES.patch
BuildRequires: cmake
@ -47,7 +44,11 @@ BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: openblas-devel
BuildRequires: pkgconfig
%if 0%{?suse_version} > 1325
BuildRequires: python2-numpy-devel
%else
BuildRequires: python-numpy-devel
%endif
BuildRequires: python3-numpy-devel
BuildRequires: tbb-devel
BuildRequires: unzip
@ -95,6 +96,7 @@ Computer Vision algorithms.
%package -n %{libname}%{soname}
Summary: Libraries to use OpenCV computer vision
License: BSD-3-Clause
Group: System/Libraries
%description -n %{libname}%{soname}
@ -104,6 +106,7 @@ utilizes Intel Integrated Performance Primitives for better performance.
%package devel
Summary: Development files for using the OpenCV library
License: BSD-3-Clause
Group: Development/Libraries/C and C++
Requires: %{libname}%{soname} = %{version}
Requires: %{name} = %{version}
@ -121,20 +124,22 @@ This package contains the OpenCV C/C++ library and header files, as well as
documentation. It should be installed if you want to develop programs that will
use the OpenCV library.
%package -n python-%{name}
%package -n python2-%{name}
Summary: Python 2 bindings for apps which use OpenCV
License: BSD-3-Clause
Group: Development/Libraries/Python
Requires: python-base
Provides: python-%{name} = %{version}-%{release}
Obsoletes: python-%{name} < %{version}-%{release}
Provides: python-%{name}-qt5
Obsoletes: python-%{name}-qt5
%description -n python-%{name}
%description -n python2-%{name}
This package contains Python 2 bindings for the OpenCV library.
%package -n python3-%{name}
Summary: Python 3 bindings for apps which use OpenCV
License: BSD-3-Clause
Group: Development/Libraries/Python
Requires: python3-base
Provides: python3-%{name}-qt5
Obsoletes: python3-%{name}-qt5
@ -143,6 +148,7 @@ This package contains Python 3 bindings for the OpenCV library.
%package doc
Summary: Documentation and examples for OpenCV
License: BSD-3-Clause
Group: Documentation/Other
Recommends: python
# Since this package also contains examples that need -devel to be compiled
@ -220,7 +226,7 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
%{_libdir}/pkgconfig/opencv.pc
%{_datadir}/OpenCV/OpenCVConfig*.cmake
%files -n python-%{name}
%files -n python2-%{name}
%defattr(-,root,root,-)
%{python_sitearch}/cv2.so