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

Accepting request 499529 from KDE:Extra

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/499529
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=65
This commit is contained in:
Dominique Leuenberger 2017-06-12 13:13:03 +00:00 committed by Git OBS Bridge
parent 9543eeb4cc
commit acc57aecda
10 changed files with 170 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3.1.0.tar.gz
View File

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

3
3.2.0.tar.gz Normal file
View File

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

18
opencv-build-compare.patch
View File

@ -1,9 +1,9 @@
--- opencv-3.1.0.orig/CMakeLists.txt 2015-12-18 16:02:16.000000000 +0100
+++ opencv-3.1.0/CMakeLists.txt 2016-02-26 22:35:39.707706679 +0100
@@ -757,11 +757,11 @@
# ========================== build platform ==========================
status("")
status(" Platform:")
--- 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
@@ -843,11 +843,11 @@
status(" Timestamp:" ${TIMESTAMP})
endif()
endif()
-status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR})
+status(" Host:" "Linux")
if(CMAKE_CROSSCOMPILING)
@ -14,9 +14,9 @@
status(" CMake generator:" ${CMAKE_GENERATOR})
status(" CMake build tool:" ${CMAKE_BUILD_TOOL})
if(MSVC)
--- opencv-3.1.0.orig/cmake/OpenCVUtils.cmake 2015-12-18 16:02:16.000000000 +0100
+++ opencv-3.1.0/cmake/OpenCVUtils.cmake 2016-02-26 22:38:12.012651960 +0100
@@ -398,15 +398,18 @@
--- 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
@@ -550,15 +550,18 @@
if(${status_cond})
string(REPLACE ";" " " status_then "${status_then}")
string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")

13
opencv-gcc5.patch
View File

@ -1,13 +0,0 @@
--- opencv-3.1.0.orig/cmake/OpenCVDetectCXXCompiler.cmake 2015-12-18 16:02:16.000000000 +0100
+++ opencv-3.1.0/cmake/OpenCVDetectCXXCompiler.cmake 2016-02-26 22:27:55.409007293 +0100
@@ -71,6 +71,10 @@
OUTPUT_VARIABLE CMAKE_OPENCV_GCC_VERSION_FULL
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if (CMAKE_OPENCV_GCC_VERSION_FULL MATCHES "5")
+ set(CMAKE_OPENCV_GCC_VERSION_FULL "5.0")
+ endif()
+
execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} -v
ERROR_VARIABLE CMAKE_OPENCV_GCC_INFO_FULL
OUTPUT_STRIP_TRAILING_WHITESPACE)

26
opencv-gcc6-disable-pch.patch
View File

@ -1,26 +0,0 @@
From a0fdc91a14f07de25d858037940fcd3ba859b4e2 Mon Sep 17 00:00:00 2001
From: Maksim Shabunin <maksim.shabunin@itseez.com>
Date: Fri, 13 May 2016 13:28:09 +0300
Subject: [PATCH] Disabled PCH support for gcc >= 6.0.0
Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option.
---
cmake/OpenCVPCHSupport.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
index 243fb4c..a2df014 100644
--- a/cmake/OpenCVPCHSupport.cmake
+++ b/cmake/OpenCVPCHSupport.cmake
@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
OUTPUT_VARIABLE gcc_compiler_version)
#MESSAGE("GCC Version: ${gcc_compiler_version}")
- IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
+ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
SET(PCHSupport_FOUND TRUE)
ENDIF()
--
2.8.2

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

@ -0,0 +1,35 @@
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()

49
opencv-qt5.changes
View File

@ -1,3 +1,52 @@
-------------------------------------------------------------------
Sun May 28 12:32:09 UTC 2017 - stefan.bruens@rwth-aachen.de
- Update to OpenCV 3.2.0
- Results from 11 GSoC 2016 projects have been submitted to the library:
+ sinusoidal patterns for structured light and phase unwrapping module
[Ambroise Moreau (Delia Passalacqua)]
+ DIS optical flow (excellent dense optical flow algorithm that is both
significantly better and significantly faster than Farneback’s algorithm –
our baseline), and learning-based color constancy algorithms implementation
[Alexander Bokov (Maksim Shabunin)]
+ CNN based tracking algorithm (GOTURN) [Tyan Vladimir (Antonella Cascitelli)]
+ PCAFlow and Global Patch Collider algorithms implementation
[Vladislav Samsonov (Ethan Rublee)]
+ Multi-language OpenCV Tutorials in Python, C++ and Java
[João Cartucho (Vincent Rabaud)]
+ New camera model and parallel processing for stitching pipeline
[Jiri Horner (Bo Li)]
+ Optimizations and improvements of dnn module
[Vitaliy Lyudvichenko (Anatoly Baksheev)]
+ Base64 and JSON support for file storage. Use names like
“myfilestorage.xml?base64” when writing file storage to store big chunks of
numerical data in base64-encoded form. [Iric Wu (Vadim Pisarevsky)]
+ tiny_dnn improvements and integration
[Edgar Riba (Manuele Tamburrano, Stefano Fabri)]
+ Quantization and semantic saliency detection with tiny_dnn
[Yida Wang (Manuele Tamburrano, Stefano Fabri)]
+ Word-spotting CNN based algorithm
[Anguelos Nicolaou (Lluis Gomez)]
- Contributions besides GSoC:
+ Greatly improved and accelerated dnn module in opencv_contrib:
- Many new layers, including deconvolution, LSTM etc.
- Support for semantic segmentation and SSD networks with samples.
- TensorFlow importer + sample that runs Inception net by Google.
+ More image formats and camera backends supported
+ Interactive camera calibration app
+ Multiple algorithms implemented in opencv_contrib
+ Supported latest OSes, including Ubuntu 16.04 LTS and OSX 10.12
+ Lot’s of optimizations for IA and ARM archs using parallelism, vector
instructions and new OpenCL kernels.
+ OpenCV now can use vendor-provided OpenVX and LAPACK/BLAS (including Intel MKL,
Apple’s Accelerate, OpenBLAS and Atlas) for acceleration
- Refreshed opencv-build-compare.patch
- Dropped upstream opencv-gcc5.patch
- Replace opencv-gcc6-disable-pch.patch with upstream patch
opencv-gcc6-fix-pch-support-PR8345.patch
- Enable TBB support (C++ threading library)
- Add dependency on openBLAS
-------------------------------------------------------------------
Thu Jul 21 07:55:09 UTC 2016 - olaf@aepfle.de

21
opencv-qt5.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package opencv-qt5
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@
%define soname 6_3
Name: opencv-qt5
Version: 3.1.0
Version: 3.2.0
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
@ -33,14 +33,12 @@ Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
Source1: opencv_contrib_face-3.1.0.tar.bz2
# PATCH-FIX-OPENSUSE opencv-qt5-sobump.diff tittiatcoke@gmail.com -- increase the so version of the libraries to force co-installability with the Qt4 version
Patch0: opencv-qt5-sobump.diff
# PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
Patch6: opencv-gcc5.patch
# PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES
Patch7: 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-OPENSUSE opencv-gcc6-disable-pch.patch -- Disable PCH for GCC6.
Patch9: opencv-gcc6-disable-pch.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
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: unzip
@ -82,6 +80,7 @@ BuildRequires: libilmbase-devel
%endif
BuildRequires: libpng16-compat-devel
BuildRequires: libpng16-devel
BuildRequires: openblas-devel
BuildRequires: python-devel
BuildRequires: python-numpy-devel
BuildRequires: python3-devel
@ -89,6 +88,7 @@ BuildRequires: python3-numpy-devel
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: python-sphinx
%endif
BuildRequires: tbb-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu)
Conflicts: opencv
@ -110,8 +110,8 @@ utilizes Intel Integrated Performance Primitives for better performance.
%package devel
Summary: Development files for using the OpenCV library
Group: Development/Libraries/C and C++
# Since 2.4.7
Group: Development/Libraries/C and C++
Provides: %{name}-devel-static = %{version}
Requires: %{libname}%{soname} = %{version}
Requires: %{name} = %{version}
@ -160,10 +160,9 @@ This package contains the documentation and examples for the OpenCV library.
%prep
%setup -q -n opencv-%version -a 1
%patch0 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
# Remove Windows specific files
rm -f doc/packaging.txt
@ -178,6 +177,7 @@ export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
export CXXFLAGS="%{optflags} ${mlra} $(getconf LFS_CFLAGS)"
mkdir build
cd build
# TODO for OCV 3.3: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX='%{_prefix}' \
-DCMAKE_SKIP_RPATH=ON \
@ -191,6 +191,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DWITH_UNICAP=ON \
-DWITH_XINE=ON \
-DWITH_IPP=OFF \
-DWITH_TBB=ON \
%if 0%{?suse_version} <= 1310
-DWITH_GSTREAMER_0_10=ON \
%endif
@ -207,6 +208,8 @@ cd build
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
# OpenCV 3.2 no longer install libopencv_ts.a if the tests are not enabled
install lib/libopencv_ts.a %{buildroot}%{_libdir}
# Fix rpmlint warning "doc-file-dependency"
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py

49
opencv.changes
View File

@ -1,3 +1,52 @@
-------------------------------------------------------------------
Sun May 28 12:32:09 UTC 2017 - stefan.bruens@rwth-aachen.de
- Update to OpenCV 3.2.0
- Results from 11 GSoC 2016 projects have been submitted to the library:
+ sinusoidal patterns for structured light and phase unwrapping module
[Ambroise Moreau (Delia Passalacqua)]
+ DIS optical flow (excellent dense optical flow algorithm that is both
significantly better and significantly faster than Farneback’s algorithm –
our baseline), and learning-based color constancy algorithms implementation
[Alexander Bokov (Maksim Shabunin)]
+ CNN based tracking algorithm (GOTURN) [Tyan Vladimir (Antonella Cascitelli)]
+ PCAFlow and Global Patch Collider algorithms implementation
[Vladislav Samsonov (Ethan Rublee)]
+ Multi-language OpenCV Tutorials in Python, C++ and Java
[João Cartucho (Vincent Rabaud)]
+ New camera model and parallel processing for stitching pipeline
[Jiri Horner (Bo Li)]
+ Optimizations and improvements of dnn module
[Vitaliy Lyudvichenko (Anatoly Baksheev)]
+ Base64 and JSON support for file storage. Use names like
“myfilestorage.xml?base64” when writing file storage to store big chunks of
numerical data in base64-encoded form. [Iric Wu (Vadim Pisarevsky)]
+ tiny_dnn improvements and integration
[Edgar Riba (Manuele Tamburrano, Stefano Fabri)]
+ Quantization and semantic saliency detection with tiny_dnn
[Yida Wang (Manuele Tamburrano, Stefano Fabri)]
+ Word-spotting CNN based algorithm
[Anguelos Nicolaou (Lluis Gomez)]
- Contributions besides GSoC:
+ Greatly improved and accelerated dnn module in opencv_contrib:
- Many new layers, including deconvolution, LSTM etc.
- Support for semantic segmentation and SSD networks with samples.
- TensorFlow importer + sample that runs Inception net by Google.
+ More image formats and camera backends supported
+ Interactive camera calibration app
+ Multiple algorithms implemented in opencv_contrib
+ Supported latest OSes, including Ubuntu 16.04 LTS and OSX 10.12
+ Lot’s of optimizations for IA and ARM archs using parallelism, vector
instructions and new OpenCL kernels.
+ OpenCV now can use vendor-provided OpenVX and LAPACK/BLAS (including Intel MKL,
Apple’s Accelerate, OpenBLAS and Atlas) for acceleration
- Refreshed opencv-build-compare.patch
- Dropped upstream opencv-gcc5.patch
- Replace opencv-gcc6-disable-pch.patch with upstream patch
opencv-gcc6-fix-pch-support-PR8345.patch
- Enable TBB support (C++ threading library)
- Add dependency on openBLAS
-------------------------------------------------------------------
Thu Jul 21 07:55:09 UTC 2016 - olaf@aepfle.de

23
opencv.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package opencv
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,10 +19,10 @@
%bcond_without ffmpeg
%define libname lib%{name}
%define soname 3_1
%define soname 3_2
Name: opencv
Version: 3.1.0
Version: 3.2.0
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
@ -31,12 +31,10 @@ Url: http://opencv.org/
Source0: https://github.com/Itseez/opencv/archive/%{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-gcc5.patch -- support gcc versions without minor version coolo@suse.de
Patch6: opencv-gcc5.patch
# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes
Patch8: opencv-build-compare.patch
# PATCH-FIX-OPENSUSE opencv-gcc6-disable-pch.patch -- Disable PCH for GCC6.
Patch9: opencv-gcc6-disable-pch.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
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: unzip
@ -74,6 +72,7 @@ BuildRequires: libilmbase-devel
%endif
BuildRequires: libpng16-compat-devel
BuildRequires: libpng16-devel
BuildRequires: openblas-devel
BuildRequires: python-devel
BuildRequires: python-numpy-devel
BuildRequires: python3-devel
@ -81,6 +80,7 @@ BuildRequires: python3-numpy-devel
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: python-sphinx
%endif
BuildRequires: tbb-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -101,8 +101,8 @@ utilizes Intel Integrated Performance Primitives for better performance.
%package devel
Summary: Development files for using the OpenCV library
Group: Development/Libraries/C and C++
# Since 2.4.7
Group: Development/Libraries/C and C++
Provides: %{name}-devel-static = %{version}
Requires: %{libname}%{soname} = %{version}
Requires: %{name} = %{version}
@ -146,9 +146,8 @@ This package contains the documentation and examples for the OpenCV library.
%prep
%setup -q -a 1
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
# Remove Windows specific files
rm -f doc/packaging.txt
@ -165,6 +164,7 @@ export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
export CXXFLAGS="%{optflags} ${mlra} $(getconf LFS_CFLAGS)"
mkdir build
cd build
# TODO for OCV 3.3: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX='%{_prefix}' \
-DCMAKE_SKIP_RPATH=ON \
@ -178,6 +178,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DWITH_UNICAP=ON \
-DWITH_XINE=ON \
-DWITH_IPP=OFF \
-DWITH_TBB=ON \
%if 0%{?suse_version} <= 1310
-DWITH_GSTREAMER_0_10=ON \
%endif
@ -194,6 +195,8 @@ cd build
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
# OpenCV 3.2 no longer install libopencv_ts.a if the tests are not enabled
install lib/libopencv_ts.a %{buildroot}%{_libdir}
# Fix rpmlint warning "doc-file-dependency"
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py