Accepting request 365841 from KDE:Extra
Update for opencv 3.1.0. Everything required for digikam is added and digikam is building OBS-URL: https://build.opensuse.org/request/show/365841 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=61
This commit is contained in:
parent
d986758c9b
commit
c612742431
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b5331ea85a709b0fe871b1ce92e631afcd5ae822423863da6b559dd2cb7845bc
|
|
||||||
size 89037182
|
|
3
3.1.0.tar.gz
Normal file
3
3.1.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf
|
||||||
|
size 76135587
|
20
_constraints
Normal file
20
_constraints
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<constraints>
|
||||||
|
<hardware>
|
||||||
|
<disk>
|
||||||
|
<!-- build uses 20GB in maintenance projects currently 201502 -->
|
||||||
|
<size unit="G">8</size>
|
||||||
|
</disk>
|
||||||
|
</hardware>
|
||||||
|
<overwrite>
|
||||||
|
<conditions>
|
||||||
|
<arch>i586</arch>
|
||||||
|
<arch>x86_64</arch>
|
||||||
|
</conditions>
|
||||||
|
<hardware>
|
||||||
|
<memory>
|
||||||
|
<size unit="M">2500</size>
|
||||||
|
</memory>
|
||||||
|
</hardware>
|
||||||
|
</overwrite>
|
||||||
|
</constraints>
|
@ -1,21 +0,0 @@
|
|||||||
Index: cmake/OpenCVDetectPython.cmake
|
|
||||||
===================================================================
|
|
||||||
--- cmake/OpenCVDetectPython.cmake.orig
|
|
||||||
+++ cmake/OpenCVDetectPython.cmake
|
|
||||||
@@ -122,11 +122,12 @@ if(PYTHON_EXECUTABLE)
|
|
||||||
if(BUILD_DOCS)
|
|
||||||
find_host_program(SPHINX_BUILD sphinx-build)
|
|
||||||
if(SPHINX_BUILD)
|
|
||||||
- execute_process(COMMAND "${SPHINX_BUILD}"
|
|
||||||
- OUTPUT_QUIET
|
|
||||||
+ execute_process(COMMAND "${SPHINX_BUILD}" -h
|
|
||||||
+ OUTPUT_VARIABLE SPHINX_OUTPUT
|
|
||||||
ERROR_VARIABLE SPHINX_OUTPUT
|
|
||||||
- OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
- if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
|
|
||||||
+ OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
+ ERROR_STRIP_TRAILING_WHITESPACE)
|
|
||||||
+ if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9]*[^ \n]*)")
|
|
||||||
set(SPHINX_VERSION "${CMAKE_MATCH_1}")
|
|
||||||
set(HAVE_SPHINX 1)
|
|
||||||
message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
|
|
@ -1,25 +0,0 @@
|
|||||||
Index: opencv-2.4.7/3rdparty/include/opencl/1.2/CL/cl_platform.h
|
|
||||||
===================================================================
|
|
||||||
--- opencv-2.4.7.orig/3rdparty/include/opencl/1.2/CL/cl_platform.h
|
|
||||||
+++ opencv-2.4.7/3rdparty/include/opencl/1.2/CL/cl_platform.h
|
|
||||||
@@ -332,13 +332,13 @@ typedef unsigned int cl_GLenum;
|
|
||||||
/* Define basic vector types */
|
|
||||||
#if defined( __VEC__ )
|
|
||||||
#include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
|
|
||||||
- typedef vector unsigned char __cl_uchar16;
|
|
||||||
- typedef vector signed char __cl_char16;
|
|
||||||
- typedef vector unsigned short __cl_ushort8;
|
|
||||||
- typedef vector signed short __cl_short8;
|
|
||||||
- typedef vector unsigned int __cl_uint4;
|
|
||||||
- typedef vector signed int __cl_int4;
|
|
||||||
- typedef vector float __cl_float4;
|
|
||||||
+ typedef __vector unsigned char __cl_uchar16;
|
|
||||||
+ typedef __vector signed char __cl_char16;
|
|
||||||
+ typedef __vector unsigned short __cl_ushort8;
|
|
||||||
+ typedef __vector signed short __cl_short8;
|
|
||||||
+ typedef __vector unsigned int __cl_uint4;
|
|
||||||
+ typedef __vector signed int __cl_int4;
|
|
||||||
+ typedef __vector float __cl_float4;
|
|
||||||
#define __CL_UCHAR16__ 1
|
|
||||||
#define __CL_CHAR16__ 1
|
|
||||||
#define __CL_USHORT8__ 1
|
|
@ -1,13 +1,6 @@
|
|||||||
---
|
--- opencv-3.1.0.orig/CMakeLists.txt 2015-12-18 16:02:16.000000000 +0100
|
||||||
CMakeLists.txt | 4 ++--
|
+++ opencv-3.1.0/CMakeLists.txt 2016-02-26 22:35:39.707706679 +0100
|
||||||
cmake/OpenCVUtils.cmake | 3 +++
|
@@ -757,11 +757,11 @@
|
||||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
Index: opencv-2.4.11/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- opencv-2.4.11.orig/CMakeLists.txt
|
|
||||||
+++ opencv-2.4.11/CMakeLists.txt
|
|
||||||
@@ -675,11 +675,11 @@ endif()
|
|
||||||
# ========================== build platform ==========================
|
# ========================== build platform ==========================
|
||||||
status("")
|
status("")
|
||||||
status(" Platform:")
|
status(" Platform:")
|
||||||
@ -21,11 +14,9 @@ Index: opencv-2.4.11/CMakeLists.txt
|
|||||||
status(" CMake generator:" ${CMAKE_GENERATOR})
|
status(" CMake generator:" ${CMAKE_GENERATOR})
|
||||||
status(" CMake build tool:" ${CMAKE_BUILD_TOOL})
|
status(" CMake build tool:" ${CMAKE_BUILD_TOOL})
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
Index: opencv-2.4.11/cmake/OpenCVUtils.cmake
|
--- 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
|
||||||
--- opencv-2.4.11.orig/cmake/OpenCVUtils.cmake
|
@@ -398,15 +398,18 @@
|
||||||
+++ opencv-2.4.11/cmake/OpenCVUtils.cmake
|
|
||||||
@@ -319,15 +319,18 @@ function(status text)
|
|
||||||
if(${status_cond})
|
if(${status_cond})
|
||||||
string(REPLACE ";" " " status_then "${status_then}")
|
string(REPLACE ";" " " status_then "${status_then}")
|
||||||
string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")
|
string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
Index: opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
|
--- 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
|
||||||
--- opencv-2.4.11.orig/cmake/OpenCVDetectCXXCompiler.cmake
|
@@ -71,6 +71,10 @@
|
||||||
+++ opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
|
|
||||||
@@ -68,6 +68,10 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
|
|
||||||
OUTPUT_VARIABLE CMAKE_OPENCV_GCC_VERSION_FULL
|
OUTPUT_VARIABLE CMAKE_OPENCV_GCC_VERSION_FULL
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
|
@ -1,11 +1,6 @@
|
|||||||
If Qt5 is configured with -opengl es2 then <QtOpenGL> doesn't define
|
--- opencv-3.1.0.orig/modules/highgui/src/window_QT.cpp 2015-12-18 16:02:16.000000000 +0100
|
||||||
GL_PERSPECTIVE_CORRECTION_HINT.
|
+++ opencv-3.1.0/modules/highgui/src/window_QT.cpp 2016-02-26 22:31:37.004570651 +0100
|
||||||
|
@@ -3165,7 +3165,9 @@
|
||||||
Index: opencv-2.4.11/modules/highgui/src/window_QT.cpp
|
|
||||||
===================================================================
|
|
||||||
--- opencv-2.4.11.orig/modules/highgui/src/window_QT.cpp
|
|
||||||
+++ opencv-2.4.11/modules/highgui/src/window_QT.cpp
|
|
||||||
@@ -3118,7 +3118,9 @@ void OpenGlViewPort::updateGl()
|
|
||||||
|
|
||||||
void OpenGlViewPort::initializeGL()
|
void OpenGlViewPort::initializeGL()
|
||||||
{
|
{
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
|
|
||||||
--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000
|
|
||||||
+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
# -------------------------------------------------------------------------------------------
|
|
||||||
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
|
||||||
set(exec_prefix "\${prefix}")
|
|
||||||
-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
|
|
||||||
+set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
|
|
||||||
set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
|
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE MATCHES "Release")
|
|
||||||
@@ -35,10 +35,11 @@
|
|
||||||
ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
|
|
||||||
|
|
||||||
#build the list of components
|
|
||||||
-set(OpenCV_LIB_COMPONENTS_ "")
|
|
||||||
+set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
|
|
||||||
foreach(CVLib ${OpenCV_LIB_COMPONENTS})
|
|
||||||
get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
|
|
||||||
get_filename_component(libname "${libpath}" NAME)
|
|
||||||
+ get_filename_component(lname "${libpath}" NAME_WE)
|
|
||||||
|
|
||||||
if(INSTALL_TO_MANGLED_PATHS)
|
|
||||||
set(libname "${libname}.${OPENCV_VERSION}")
|
|
||||||
@@ -51,7 +52,8 @@
|
|
||||||
set(installDir "${OPENCV_LIB_INSTALL_PATH}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
- set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
|
|
||||||
+ string(REPLACE "libopencv" "-lopencv" lname "${lname}")
|
|
||||||
+ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
# add extra dependencies required for OpenCV
|
|
@ -1,12 +1,17 @@
|
|||||||
diff -urB opencv-2.4.9/cmake/OpenCVVersion.cmake new/cmake/OpenCVVersion.cmake
|
--- opencv-3.1.0.orig/cmake/OpenCVVersion.cmake 2015-12-18 16:02:16.000000000 +0100
|
||||||
--- opencv-2.4.9/cmake/OpenCVVersion.cmake 2014-04-11 12:15:26.000000000 +0200
|
+++ opencv-3.1.0/cmake/OpenCVVersion.cmake 2016-02-27 15:38:45.228901282 +0100
|
||||||
+++ new/cmake/OpenCVVersion.cmake 2015-01-03 19:56:37.829234402 +0100
|
@@ -1,10 +1,10 @@
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
SET(OPENCV_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/modules/core/include/opencv2/core/version.hpp")
|
SET(OPENCV_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/modules/core/include/opencv2/core/version.hpp")
|
||||||
FILE(STRINGS "${OPENCV_VERSION_FILE}" OPENCV_VERSION_PARTS REGEX "#define CV_VERSION_[A-Z]+[ ]+[0-9]+" )
|
file(STRINGS "${OPENCV_VERSION_FILE}" OPENCV_VERSION_PARTS REGEX "#define CV_VERSION_[A-Z]+[ ]+" )
|
||||||
|
|
||||||
|
-string(REGEX REPLACE ".+CV_VERSION_MAJOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MAJOR "${OPENCV_VERSION_PARTS}")
|
||||||
|
-string(REGEX REPLACE ".+CV_VERSION_MINOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}")
|
||||||
|
-string(REGEX REPLACE ".+CV_VERSION_REVISION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}")
|
||||||
|
-string(REGEX REPLACE ".+CV_VERSION_STATUS[ ]+\"([^\"]*)\".*" "\\1" OPENCV_VERSION_STATUS "${OPENCV_VERSION_PARTS}")
|
||||||
|
+set(OPENCV_VERSION_MAJOR 6)
|
||||||
|
+string(REGEX REPLACE ".+CV_VERSION_MAJOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}")
|
||||||
|
+string(REGEX REPLACE ".+CV_VERSION_MINOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}")
|
||||||
|
+string(REGEX REPLACE ".+CV_VERSION_REVISION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_TWEAK "${OPENCV_VERSION_PARTS}")
|
||||||
|
|
||||||
|
set(OPENCV_VERSION_PLAIN "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
|
||||||
|
|
||||||
-string(REGEX REPLACE ".+CV_VERSION_EPOCH[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MAJOR "${OPENCV_VERSION_PARTS}")
|
|
||||||
+set(OPENCV_VERSION_MAJOR 5)
|
|
||||||
string(REGEX REPLACE ".+CV_VERSION_MAJOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}")
|
|
||||||
string(REGEX REPLACE ".+CV_VERSION_MINOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}")
|
|
||||||
string(REGEX REPLACE ".+CV_VERSION_REVISION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_TWEAK "${OPENCV_VERSION_PARTS}")
|
|
||||||
|
@ -1,3 +1,138 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 3 21:17:52 UTC 2016 - tittiatcoke@gmail.com
|
||||||
|
|
||||||
|
- Added opencv_contrib_face-3.1.0.tar.bz2
|
||||||
|
* This tarball is created to take only the face module from the
|
||||||
|
contrib package. The Face module is required by libkface, which
|
||||||
|
in its turn is required by digikam.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Feb 28 19:37:23 UTC 2016 - joerg.lorenzen@ki.tng.de
|
||||||
|
|
||||||
|
- Added _constraints file to avoid random failures on small workers
|
||||||
|
(at least for builds on PMBS)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Feb 27 11:11:34 UTC 2016 - joerg.lorenzen@ki.tng.de
|
||||||
|
|
||||||
|
- Update to OpenCV 3.1.0
|
||||||
|
- A lot of new functionality has been introduced during Google
|
||||||
|
Summer of Code 2015:
|
||||||
|
+ “Omnidirectional Cameras Calibration and Stereo 3D
|
||||||
|
Reconstruction” – opencv_contrib/ccalib module
|
||||||
|
(Baisheng Lai, Bo Li)
|
||||||
|
+ “Structure From Motion” – opencv_contrib/sfm module
|
||||||
|
(Edgar Riba, Vincent Rabaud)
|
||||||
|
+ “Improved Deformable Part-based Models” – opencv_contrib/dpm
|
||||||
|
module (Jiaolong Xu, Bence Magyar)
|
||||||
|
+ “Real-time Multi-object Tracking using Kernelized Correlation
|
||||||
|
Filter” – opencv_contrib/tracking module
|
||||||
|
(Laksono Kurnianggoro, Fernando J. Iglesias Garcia)
|
||||||
|
+ “Improved and expanded Scene Text Detection” –
|
||||||
|
opencv_contrib/text module (Lluis Gomez, Vadim Pisarevsky)
|
||||||
|
+ “Stereo correspondence improvements” – opencv_contrib/stereo
|
||||||
|
module (Mircea Paul Muresan, Sergei Nosov)
|
||||||
|
+ “Structured-Light System Calibration” –
|
||||||
|
opencv_contrib/structured_light (Roberta Ravanelli,
|
||||||
|
Delia Passalacqua, Stefano Fabri, Claudia Rapuano)
|
||||||
|
+ “Chessboard+ArUco for camera calibration” –
|
||||||
|
opencv_contrib/aruco (Sergio Garrido, Prasanna, Gary Bradski)
|
||||||
|
+ “Implementation of universal interface for deep neural
|
||||||
|
network frameworks” – opencv_contrib/dnn module
|
||||||
|
(Vitaliy Lyudvichenko, Anatoly Baksheev)
|
||||||
|
+ “Recent advances in edge-aware filtering, improved SGBM
|
||||||
|
stereo algorithm” – opencv/calib3d and opencv_contrib/ximgproc
|
||||||
|
(Alexander Bokov, Maksim Shabunin)
|
||||||
|
+ “Improved ICF detector, waldboost implementation” –
|
||||||
|
opencv_contrib/xobjdetect (Vlad Shakhuro, Alexander Bovyrin)
|
||||||
|
+ “Multi-target TLD tracking” – opencv_contrib/tracking module
|
||||||
|
(Vladimir Tyan, Antonella Cascitelli)
|
||||||
|
+ “3D pose estimation using CNNs” – opencv_contrib/cnn_3dobj
|
||||||
|
(Yida Wang, Manuele Tamburrano, Stefano Fabri)
|
||||||
|
- Many great contributions made by the community, such as:
|
||||||
|
+ Support for HDF5 format
|
||||||
|
+ New/Improved optical flow algorithms
|
||||||
|
+ Multiple new image processing algorithms for filtering,
|
||||||
|
segmentation and feature detection
|
||||||
|
+ Superpixel segmentation and much more
|
||||||
|
- IPPICV is now based on IPP 9.0.1, which should make OpenCV
|
||||||
|
even faster on modern Intel chips
|
||||||
|
- opencv_contrib modules can now be included into the
|
||||||
|
opencv2.framework for iOS
|
||||||
|
- Newest operating systems are supported: Windows 10 and
|
||||||
|
OSX 10.11 (Visual Studio 2015 and XCode 7.1.1)
|
||||||
|
- Interoperability between T-API and OpenCL, OpenGL, DirectX and
|
||||||
|
Video Acceleration API on Linux, as well as Android 5 camera.
|
||||||
|
- HAL (Hardware Acceleration Layer) module functionality has been
|
||||||
|
moved into corresponding basic modules; the HAL replacement
|
||||||
|
mechanism has been implemented along with the examples
|
||||||
|
- Removed improve-sphinx-search.diff, opencv-altivec-vector.patch,
|
||||||
|
opencv-pkgconfig.patch and opencv-samples.patch, fixed upstream.
|
||||||
|
- Fixed opencv-qt5-sobump.diff, opencv-build-compare.patch,
|
||||||
|
opencv-gcc5.patch and opencv-gles.patch.
|
||||||
|
|
||||||
|
- Version OpenCV 3.0.0
|
||||||
|
+ ~1500 patches, submitted as PR @ github. All our patches go
|
||||||
|
the same route.
|
||||||
|
+ opencv_contrib (http://github.com/itseez/opencv_contrib)
|
||||||
|
repository has been added. A lot of new functionality is there
|
||||||
|
already! opencv_contrib is only compatible with 3.0/master,
|
||||||
|
not 2.4. Clone the repository and use “cmake …
|
||||||
|
-D OPENCV_EXTRA_MODULES_PATH=<path_to opencv_contrib/modules> …”
|
||||||
|
to build opencv and opencv_contrib together.
|
||||||
|
+ a subset of Intel IPP (IPPCV) is given to us and our users free
|
||||||
|
of charge, free of licensing fees, for commercial and
|
||||||
|
non-commerical use. It’s used by default in x86 and x64 builds
|
||||||
|
on Windows, Linux and Mac.
|
||||||
|
+ T-API (transparent API) has been introduced, this is transparent
|
||||||
|
GPU acceleration layer using OpenCL. It does not add any
|
||||||
|
compile-time or runtime dependency of OpenCL. When OpenCL is
|
||||||
|
available, it’s detected and used, but it can be disabled at
|
||||||
|
compile time or at runtime. It covers ~100 OpenCV functions.
|
||||||
|
This work has been done by contract and with generous support
|
||||||
|
from AMD and Intel companies.
|
||||||
|
+ ~40 OpenCV functions have been accelerated using NEON intrinsics
|
||||||
|
and because these are mostly basic functions, some higher-level
|
||||||
|
functions got accelerated as well.
|
||||||
|
+ There is also new OpenCV HAL layer that will simplifies creation
|
||||||
|
of NEON-optimized code and that should form a base for the
|
||||||
|
open-source and proprietary OpenCV accelerators.
|
||||||
|
+ The documentation is now in Doxygen: http://docs.opencv.org/master/
|
||||||
|
+ We cleaned up API of many high-level algorithms from features2d,
|
||||||
|
calib3d, objdetect etc. They now follow the uniform
|
||||||
|
“abstract interface – hidden implementation” pattern and make
|
||||||
|
extensive use of smart pointers (Ptr<>).
|
||||||
|
+ Greatly improved and extended Python & Java bindings (also,
|
||||||
|
see below on the Python bindings), newly introduced Matlab
|
||||||
|
bindings (still in alpha stage).
|
||||||
|
+ Improved Android support – now OpenCV Manager is in Java and
|
||||||
|
supports both 2.4 and 3.0.
|
||||||
|
+ Greatly improved WinRT support, including video capturing and
|
||||||
|
multi-threading capabilities. Thanks for Microsoft team for this!
|
||||||
|
+ Big thanks to Google who funded several successive GSoC programs
|
||||||
|
and let OpenCV in. The results of many successful GSoC 2013 and
|
||||||
|
2014 projects have been integrated in opencv 3.0 and
|
||||||
|
opencv_contrib (earlier results are also available in
|
||||||
|
OpenCV 2.4.x). We can name:
|
||||||
|
- text detection
|
||||||
|
- many computational photography algorithms (HDR, inpainting,
|
||||||
|
edge-aware filters, superpixels, …)
|
||||||
|
- tracking and optical flow algorithms
|
||||||
|
- new features, including line descriptors, KAZE/AKAZE
|
||||||
|
- general use optimization (hill climbing, linear programming)
|
||||||
|
- greatly improved Python support, including Python 3.0 support,
|
||||||
|
many new tutorials & samples on how to use OpenCV with Python.
|
||||||
|
- 2d shape matching module and 3d surface matching module
|
||||||
|
- RGB-D module
|
||||||
|
- VTK-based 3D visualization module
|
||||||
|
- etc.
|
||||||
|
+ Besides Google, we enjoyed (and hope that you will enjoy too)
|
||||||
|
many useful contributions from community, like:
|
||||||
|
- biologically inspired vision module
|
||||||
|
- DAISY features, LATCH descriptor, improved BRIEF
|
||||||
|
- image registration module
|
||||||
|
- etc.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de
|
Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de
|
||||||
|
|
||||||
|
@ -19,27 +19,20 @@
|
|||||||
%bcond_with ffmpeg
|
%bcond_with ffmpeg
|
||||||
|
|
||||||
%define libname lib%{name}
|
%define libname lib%{name}
|
||||||
%define soname 5_4
|
%define soname 6_3
|
||||||
|
|
||||||
Name: opencv-qt5
|
Name: opencv-qt5
|
||||||
Version: 2.4.11
|
Version: 3.1.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Url: http://opencv.org/
|
Url: http://opencv.org/
|
||||||
Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
|
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-OPENSUSE opencv-qt5-sobump.diff tittiatcoke@gmail.com -- increase the so version of the libraries to force co-installability with the Qt4 version
|
# 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
|
Patch0: opencv-qt5-sobump.diff
|
||||||
# PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
|
|
||||||
Patch1: opencv-samples.patch
|
|
||||||
# PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version
|
|
||||||
Patch3: improve-sphinx-search.diff
|
|
||||||
# PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on
|
|
||||||
# getting opencv vars via pc (first), and then via CMake, as is the case with nomacs
|
|
||||||
# PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157
|
|
||||||
Patch4: opencv-pkgconfig.patch
|
|
||||||
Patch5: opencv-altivec-vector.patch
|
|
||||||
# PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
|
# PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
|
||||||
Patch6: opencv-gcc5.patch
|
Patch6: opencv-gcc5.patch
|
||||||
# PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES
|
# PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES
|
||||||
@ -48,6 +41,7 @@ Patch7: opencv-gles.patch
|
|||||||
Patch8: opencv-build-compare.patch
|
Patch8: opencv-build-compare.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: unzip
|
||||||
%if 0%{?suse_version} > 1310
|
%if 0%{?suse_version} > 1310
|
||||||
BuildRequires: gstreamer-plugins-base-devel
|
BuildRequires: gstreamer-plugins-base-devel
|
||||||
%else
|
%else
|
||||||
@ -62,11 +56,12 @@ BuildRequires: libeigen3-devel
|
|||||||
BuildRequires: libeigen2-devel
|
BuildRequires: libeigen2-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{with ffmpeg}
|
%if %{with ffmpeg}
|
||||||
BuildRequires: pkgconfig(libavcodec)
|
BuildRequires: pkgconfig(libavcodec) >= 57
|
||||||
BuildRequires: pkgconfig(libavformat)
|
BuildRequires: pkgconfig(libavformat) >= 57
|
||||||
BuildRequires: pkgconfig(libavutil)
|
BuildRequires: pkgconfig(libavutil) >= 55
|
||||||
BuildRequires: pkgconfig(libswscale)
|
BuildRequires: pkgconfig(libswscale) >= 4
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: libgphoto2-devel
|
||||||
BuildRequires: libjasper-devel
|
BuildRequires: libjasper-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
@ -151,20 +146,14 @@ Conflicts: opencv-doc
|
|||||||
This package contains the documentation and examples for the OpenCV library.
|
This package contains the documentation and examples for the OpenCV library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n opencv-%version
|
%setup -q -n opencv-%version -a 1
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
%patch3 -p0
|
|
||||||
#%patch4 -p1
|
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
|
||||||
# Remove Windows specific files
|
# Remove Windows specific files
|
||||||
rm -f doc/packaging.txt
|
rm -f doc/packaging.txt
|
||||||
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
|
|
||||||
sed -i 's/\r$//' samples/c/facedetect.cmd
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
|
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
|
||||||
@ -183,6 +172,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
|
|||||||
-DWITH_OPENGL=ON \
|
-DWITH_OPENGL=ON \
|
||||||
-DWITH_UNICAP=ON \
|
-DWITH_UNICAP=ON \
|
||||||
-DWITH_XINE=ON \
|
-DWITH_XINE=ON \
|
||||||
|
-DWITH_IPP=OFF \
|
||||||
%if 0%{?suse_version} <= 1310
|
%if 0%{?suse_version} <= 1310
|
||||||
-DWITH_GSTREAMER_0_10=ON \
|
-DWITH_GSTREAMER_0_10=ON \
|
||||||
%endif
|
%endif
|
||||||
@ -197,17 +187,11 @@ make %{?_smp_mflags} VERBOSE=1
|
|||||||
%install
|
%install
|
||||||
cd build
|
cd build
|
||||||
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
|
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
|
||||||
mkdir -p %{buildroot}%{_docdir}
|
|
||||||
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
|
|
||||||
mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc
|
|
||||||
%else
|
|
||||||
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
|
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
|
||||||
%endif
|
|
||||||
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
|
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
|
||||||
|
|
||||||
# Fix rpmlint warning "doc-file-dependency"
|
# Fix rpmlint warning "doc-file-dependency"
|
||||||
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
|
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
|
||||||
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py
|
|
||||||
|
|
||||||
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples
|
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples
|
||||||
%fdupes -s %{buildroot}%{_includedir}
|
%fdupes -s %{buildroot}%{_includedir}
|
||||||
@ -237,7 +221,6 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py
|
|||||||
|
|
||||||
%files -n python-%name
|
%files -n python-%name
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{python_sitearch}/cv.py
|
|
||||||
%{python_sitearch}/cv2.so
|
%{python_sitearch}/cv2.so
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
|
@ -1,97 +0,0 @@
|
|||||||
Index: opencv-2.4.11/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- opencv-2.4.11.orig/CMakeLists.txt
|
|
||||||
+++ opencv-2.4.11/CMakeLists.txt
|
|
||||||
@@ -576,7 +576,7 @@ if(BUILD_opencv_apps)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# examples
|
|
||||||
-if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
|
|
||||||
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
|
|
||||||
add_subdirectory(samples)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
Index: opencv-2.4.11/samples/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- opencv-2.4.11.orig/samples/CMakeLists.txt
|
|
||||||
+++ opencv-2.4.11/samples/CMakeLists.txt
|
|
||||||
@@ -10,6 +10,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_C
|
|
||||||
#
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES)
|
|
||||||
add_subdirectory(c)
|
|
||||||
add_subdirectory(cpp)
|
|
||||||
add_subdirectory(gpu)
|
|
||||||
@@ -19,11 +20,17 @@ if(ANDROID AND BUILD_ANDROID_EXAMPLES)
|
|
||||||
add_subdirectory(android)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
+if(INSTALL_PYTHON_EXAMPLES)
|
|
||||||
+add_subdirectory(python)
|
|
||||||
+add_subdirectory(python2)
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
if(INSTALL_C_EXAMPLES)
|
|
||||||
install(FILES "CMakeLists.txt"
|
|
||||||
DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}
|
|
||||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
|
|
||||||
endif()
|
|
||||||
+endif()
|
|
||||||
|
|
||||||
#
|
|
||||||
# END OF BUILD CASE 1: Build samples with library sources
|
|
||||||
@@ -70,4 +77,4 @@ add_subdirectory(gpu)
|
|
||||||
#
|
|
||||||
# END OF BUILD CASE 2: Build samples with library binaries
|
|
||||||
#
|
|
||||||
-endif()
|
|
||||||
\ No newline at end of file
|
|
||||||
+endif()
|
|
||||||
Index: opencv-2.4.11/samples/python/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null
|
|
||||||
+++ opencv-2.4.11/samples/python/CMakeLists.txt
|
|
||||||
@@ -0,0 +1,12 @@
|
|
||||||
+# -------------------------------------------------------------------------
|
|
||||||
+# CMake file for Python samples. See root CMakeLists.txt
|
|
||||||
+# -------------------------------------------------------------------------
|
|
||||||
+
|
|
||||||
+file(GLOB PYTHON_SAMPLES *.py)
|
|
||||||
+if(NOT WIN32)
|
|
||||||
+install(FILES ${PYTHON_SAMPLES}
|
|
||||||
+ DESTINATION share/OpenCV/samples/python
|
|
||||||
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
|
|
||||||
+ GROUP_READ GROUP_EXECUTE
|
|
||||||
+ WORLD_READ WORLD_EXECUTE)
|
|
||||||
+endif()
|
|
||||||
Index: opencv-2.4.11/samples/python2/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null
|
|
||||||
+++ opencv-2.4.11/samples/python2/CMakeLists.txt
|
|
||||||
@@ -0,0 +1,12 @@
|
|
||||||
+# -------------------------------------------------------------------------
|
|
||||||
+# CMake file for Python samples. See root CMakeLists.txt
|
|
||||||
+# -------------------------------------------------------------------------
|
|
||||||
+
|
|
||||||
+file(GLOB PYTHON_SAMPLES *.py)
|
|
||||||
+if(NOT WIN32)
|
|
||||||
+install(FILES ${PYTHON_SAMPLES}
|
|
||||||
+ DESTINATION share/OpenCV/samples/python2
|
|
||||||
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
|
|
||||||
+ GROUP_READ GROUP_EXECUTE
|
|
||||||
+ WORLD_READ WORLD_EXECUTE)
|
|
||||||
+endif()
|
|
||||||
Index: opencv-2.4.11/samples/gpu/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- opencv-2.4.11.orig/samples/gpu/CMakeLists.txt
|
|
||||||
+++ opencv-2.4.11/samples/gpu/CMakeLists.txt
|
|
||||||
@@ -100,7 +100,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_F
|
|
||||||
include("performance/CMakeLists.txt")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-if (OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
|
|
||||||
+if (BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
|
|
||||||
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd *.txt)
|
|
||||||
if(NOT HAVE_OPENGL)
|
|
||||||
list_filterout(install_list ".*opengl.cpp")
|
|
135
opencv.changes
135
opencv.changes
@ -1,3 +1,138 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 3 21:16:19 UTC 2016 - tittiatcoke@gmail.com
|
||||||
|
|
||||||
|
- Added opencv_contrib_face-3.1.0.tar.bz2
|
||||||
|
* This tarball is created to take only the face module from the
|
||||||
|
contrib package. The Face module is required by libkface, which
|
||||||
|
in its turn is required by digikam.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Feb 28 19:37:23 UTC 2016 - joerg.lorenzen@ki.tng.de
|
||||||
|
|
||||||
|
- Added _constraints file to avoid random failures on small workers
|
||||||
|
(at least for builds on PMBS)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Feb 27 11:11:34 UTC 2016 - joerg.lorenzen@ki.tng.de
|
||||||
|
|
||||||
|
- Update to OpenCV 3.1.0
|
||||||
|
- A lot of new functionality has been introduced during Google
|
||||||
|
Summer of Code 2015:
|
||||||
|
+ “Omnidirectional Cameras Calibration and Stereo 3D
|
||||||
|
Reconstruction” – opencv_contrib/ccalib module
|
||||||
|
(Baisheng Lai, Bo Li)
|
||||||
|
+ “Structure From Motion” – opencv_contrib/sfm module
|
||||||
|
(Edgar Riba, Vincent Rabaud)
|
||||||
|
+ “Improved Deformable Part-based Models” – opencv_contrib/dpm
|
||||||
|
module (Jiaolong Xu, Bence Magyar)
|
||||||
|
+ “Real-time Multi-object Tracking using Kernelized Correlation
|
||||||
|
Filter” – opencv_contrib/tracking module
|
||||||
|
(Laksono Kurnianggoro, Fernando J. Iglesias Garcia)
|
||||||
|
+ “Improved and expanded Scene Text Detection” –
|
||||||
|
opencv_contrib/text module (Lluis Gomez, Vadim Pisarevsky)
|
||||||
|
+ “Stereo correspondence improvements” – opencv_contrib/stereo
|
||||||
|
module (Mircea Paul Muresan, Sergei Nosov)
|
||||||
|
+ “Structured-Light System Calibration” –
|
||||||
|
opencv_contrib/structured_light (Roberta Ravanelli,
|
||||||
|
Delia Passalacqua, Stefano Fabri, Claudia Rapuano)
|
||||||
|
+ “Chessboard+ArUco for camera calibration” –
|
||||||
|
opencv_contrib/aruco (Sergio Garrido, Prasanna, Gary Bradski)
|
||||||
|
+ “Implementation of universal interface for deep neural
|
||||||
|
network frameworks” – opencv_contrib/dnn module
|
||||||
|
(Vitaliy Lyudvichenko, Anatoly Baksheev)
|
||||||
|
+ “Recent advances in edge-aware filtering, improved SGBM
|
||||||
|
stereo algorithm” – opencv/calib3d and opencv_contrib/ximgproc
|
||||||
|
(Alexander Bokov, Maksim Shabunin)
|
||||||
|
+ “Improved ICF detector, waldboost implementation” –
|
||||||
|
opencv_contrib/xobjdetect (Vlad Shakhuro, Alexander Bovyrin)
|
||||||
|
+ “Multi-target TLD tracking” – opencv_contrib/tracking module
|
||||||
|
(Vladimir Tyan, Antonella Cascitelli)
|
||||||
|
+ “3D pose estimation using CNNs” – opencv_contrib/cnn_3dobj
|
||||||
|
(Yida Wang, Manuele Tamburrano, Stefano Fabri)
|
||||||
|
- Many great contributions made by the community, such as:
|
||||||
|
+ Support for HDF5 format
|
||||||
|
+ New/Improved optical flow algorithms
|
||||||
|
+ Multiple new image processing algorithms for filtering,
|
||||||
|
segmentation and feature detection
|
||||||
|
+ Superpixel segmentation and much more
|
||||||
|
- IPPICV is now based on IPP 9.0.1, which should make OpenCV
|
||||||
|
even faster on modern Intel chips
|
||||||
|
- opencv_contrib modules can now be included into the
|
||||||
|
opencv2.framework for iOS
|
||||||
|
- Newest operating systems are supported: Windows 10 and
|
||||||
|
OSX 10.11 (Visual Studio 2015 and XCode 7.1.1)
|
||||||
|
- Interoperability between T-API and OpenCL, OpenGL, DirectX and
|
||||||
|
Video Acceleration API on Linux, as well as Android 5 camera.
|
||||||
|
- HAL (Hardware Acceleration Layer) module functionality has been
|
||||||
|
moved into corresponding basic modules; the HAL replacement
|
||||||
|
mechanism has been implemented along with the examples
|
||||||
|
- Removed improve-sphinx-search.diff, opencv-altivec-vector.patch,
|
||||||
|
opencv-pkgconfig.patch and opencv-samples.patch, fixed upstream.
|
||||||
|
- Fixed opencv-qt5-sobump.diff, opencv-build-compare.patch,
|
||||||
|
opencv-gcc5.patch and opencv-gles.patch.
|
||||||
|
|
||||||
|
- Version OpenCV 3.0.0
|
||||||
|
+ ~1500 patches, submitted as PR @ github. All our patches go
|
||||||
|
the same route.
|
||||||
|
+ opencv_contrib (http://github.com/itseez/opencv_contrib)
|
||||||
|
repository has been added. A lot of new functionality is there
|
||||||
|
already! opencv_contrib is only compatible with 3.0/master,
|
||||||
|
not 2.4. Clone the repository and use “cmake …
|
||||||
|
-D OPENCV_EXTRA_MODULES_PATH=<path_to opencv_contrib/modules> …”
|
||||||
|
to build opencv and opencv_contrib together.
|
||||||
|
+ a subset of Intel IPP (IPPCV) is given to us and our users free
|
||||||
|
of charge, free of licensing fees, for commercial and
|
||||||
|
non-commerical use. It’s used by default in x86 and x64 builds
|
||||||
|
on Windows, Linux and Mac.
|
||||||
|
+ T-API (transparent API) has been introduced, this is transparent
|
||||||
|
GPU acceleration layer using OpenCL. It does not add any
|
||||||
|
compile-time or runtime dependency of OpenCL. When OpenCL is
|
||||||
|
available, it’s detected and used, but it can be disabled at
|
||||||
|
compile time or at runtime. It covers ~100 OpenCV functions.
|
||||||
|
This work has been done by contract and with generous support
|
||||||
|
from AMD and Intel companies.
|
||||||
|
+ ~40 OpenCV functions have been accelerated using NEON intrinsics
|
||||||
|
and because these are mostly basic functions, some higher-level
|
||||||
|
functions got accelerated as well.
|
||||||
|
+ There is also new OpenCV HAL layer that will simplifies creation
|
||||||
|
of NEON-optimized code and that should form a base for the
|
||||||
|
open-source and proprietary OpenCV accelerators.
|
||||||
|
+ The documentation is now in Doxygen: http://docs.opencv.org/master/
|
||||||
|
+ We cleaned up API of many high-level algorithms from features2d,
|
||||||
|
calib3d, objdetect etc. They now follow the uniform
|
||||||
|
“abstract interface – hidden implementation” pattern and make
|
||||||
|
extensive use of smart pointers (Ptr<>).
|
||||||
|
+ Greatly improved and extended Python & Java bindings (also,
|
||||||
|
see below on the Python bindings), newly introduced Matlab
|
||||||
|
bindings (still in alpha stage).
|
||||||
|
+ Improved Android support – now OpenCV Manager is in Java and
|
||||||
|
supports both 2.4 and 3.0.
|
||||||
|
+ Greatly improved WinRT support, including video capturing and
|
||||||
|
multi-threading capabilities. Thanks for Microsoft team for this!
|
||||||
|
+ Big thanks to Google who funded several successive GSoC programs
|
||||||
|
and let OpenCV in. The results of many successful GSoC 2013 and
|
||||||
|
2014 projects have been integrated in opencv 3.0 and
|
||||||
|
opencv_contrib (earlier results are also available in
|
||||||
|
OpenCV 2.4.x). We can name:
|
||||||
|
- text detection
|
||||||
|
- many computational photography algorithms (HDR, inpainting,
|
||||||
|
edge-aware filters, superpixels, …)
|
||||||
|
- tracking and optical flow algorithms
|
||||||
|
- new features, including line descriptors, KAZE/AKAZE
|
||||||
|
- general use optimization (hill climbing, linear programming)
|
||||||
|
- greatly improved Python support, including Python 3.0 support,
|
||||||
|
many new tutorials & samples on how to use OpenCV with Python.
|
||||||
|
- 2d shape matching module and 3d surface matching module
|
||||||
|
- RGB-D module
|
||||||
|
- VTK-based 3D visualization module
|
||||||
|
- etc.
|
||||||
|
+ Besides Google, we enjoyed (and hope that you will enjoy too)
|
||||||
|
many useful contributions from community, like:
|
||||||
|
- biologically inspired vision module
|
||||||
|
- DAISY features, LATCH descriptor, improved BRIEF
|
||||||
|
- image registration module
|
||||||
|
- etc.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de
|
Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de
|
||||||
|
|
||||||
|
41
opencv.spec
41
opencv.spec
@ -19,31 +19,25 @@
|
|||||||
%bcond_with ffmpeg
|
%bcond_with ffmpeg
|
||||||
|
|
||||||
%define libname lib%{name}
|
%define libname lib%{name}
|
||||||
%define soname 2_4
|
%define soname 3_1
|
||||||
|
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 2.4.11
|
Version: 3.1.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Url: http://opencv.org/
|
Url: http://opencv.org/
|
||||||
Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
|
Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
|
# This is the FACE module from the opencv_contrib package. Packaged separately to prevent too much usntable modules
|
||||||
Patch1: opencv-samples.patch
|
Source1: opencv_contrib_face-3.1.0.tar.bz2
|
||||||
# PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version
|
|
||||||
Patch3: improve-sphinx-search.diff
|
|
||||||
# PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on
|
|
||||||
# getting opencv vars via pc (first), and then via CMake, as is the case with nomacs
|
|
||||||
# PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157
|
|
||||||
Patch4: opencv-pkgconfig.patch
|
|
||||||
Patch5: opencv-altivec-vector.patch
|
|
||||||
# PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
|
# PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
|
||||||
Patch6: opencv-gcc5.patch
|
Patch6: opencv-gcc5.patch
|
||||||
# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes
|
# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes
|
||||||
Patch8: opencv-build-compare.patch
|
Patch8: opencv-build-compare.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: unzip
|
||||||
%if 0%{?suse_version} > 1310
|
%if 0%{?suse_version} > 1310
|
||||||
BuildRequires: gstreamer-plugins-base-devel
|
BuildRequires: gstreamer-plugins-base-devel
|
||||||
%else
|
%else
|
||||||
@ -58,11 +52,12 @@ BuildRequires: libeigen3-devel
|
|||||||
BuildRequires: libeigen2-devel
|
BuildRequires: libeigen2-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{with ffmpeg}
|
%if %{with ffmpeg}
|
||||||
BuildRequires: pkgconfig(libavcodec)
|
BuildRequires: pkgconfig(libavcodec) >= 57
|
||||||
BuildRequires: pkgconfig(libavformat)
|
BuildRequires: pkgconfig(libavformat) >= 57
|
||||||
BuildRequires: pkgconfig(libavutil)
|
BuildRequires: pkgconfig(libavutil) >= 55
|
||||||
BuildRequires: pkgconfig(libswscale)
|
BuildRequires: pkgconfig(libswscale) >= 4
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: libgphoto2-devel
|
||||||
BuildRequires: libjasper-devel
|
BuildRequires: libjasper-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libqt4-devel
|
BuildRequires: libqt4-devel
|
||||||
@ -139,18 +134,14 @@ Recommends: %{name}-devel
|
|||||||
This package contains the documentation and examples for the OpenCV library.
|
This package contains the documentation and examples for the OpenCV library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -a 1
|
||||||
%patch1 -p1
|
|
||||||
%patch3 -p0
|
|
||||||
#%patch4 -p1
|
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
|
||||||
# Remove Windows specific files
|
# Remove Windows specific files
|
||||||
rm -f doc/packaging.txt
|
rm -f doc/packaging.txt
|
||||||
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
|
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
|
||||||
sed -i 's/\r$//' samples/c/facedetect.cmd
|
# sed -i 's/\r$//' samples/c/facedetect.cmd
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
|
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
|
||||||
@ -169,6 +160,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
|
|||||||
-DWITH_OPENGL=ON \
|
-DWITH_OPENGL=ON \
|
||||||
-DWITH_UNICAP=ON \
|
-DWITH_UNICAP=ON \
|
||||||
-DWITH_XINE=ON \
|
-DWITH_XINE=ON \
|
||||||
|
-DWITH_IPP=OFF \
|
||||||
%if 0%{?suse_version} <= 1310
|
%if 0%{?suse_version} <= 1310
|
||||||
-DWITH_GSTREAMER_0_10=ON \
|
-DWITH_GSTREAMER_0_10=ON \
|
||||||
%endif
|
%endif
|
||||||
@ -183,17 +175,11 @@ make %{?_smp_mflags} VERBOSE=1
|
|||||||
%install
|
%install
|
||||||
cd build
|
cd build
|
||||||
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
|
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
|
||||||
mkdir -p %{buildroot}%{_docdir}
|
|
||||||
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
|
|
||||||
mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc
|
|
||||||
%else
|
|
||||||
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
|
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
|
||||||
%endif
|
|
||||||
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
|
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
|
||||||
|
|
||||||
# Fix rpmlint warning "doc-file-dependency"
|
# Fix rpmlint warning "doc-file-dependency"
|
||||||
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
|
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python/*.py
|
||||||
chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py
|
|
||||||
|
|
||||||
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples
|
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples
|
||||||
%fdupes -s %{buildroot}%{_includedir}
|
%fdupes -s %{buildroot}%{_includedir}
|
||||||
@ -223,7 +209,6 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py
|
|||||||
|
|
||||||
%files -n python-%name
|
%files -n python-%name
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{python_sitearch}/cv.py
|
|
||||||
%{python_sitearch}/cv2.so
|
%{python_sitearch}/cv2.so
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
|
3
opencv_contrib_face-3.1.0.tar.bz2
Normal file
3
opencv_contrib_face-3.1.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:8c5ffca434938ac7fd818ac90eaf48f2fd3ee3dec2089e4c03971eae38ffe694
|
||||||
|
size 2052039
|
Loading…
Reference in New Issue
Block a user