Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2017-06-12 15:13:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Mon Jun 12 15:13:03 2017 rev:65 rq:499529 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv-qt5.changes 2016-07-28 23:43:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes 2017-06-12 15:13:08.479662466 +0200 @@ -1,0 +2,49 @@ +Sun May 28 12:32:09 UTC 2017 - [email protected] + +- 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 + +------------------------------------------------------------------- opencv.changes: same change Old: ---- 3.1.0.tar.gz opencv-gcc5.patch opencv-gcc6-disable-pch.patch New: ---- 3.2.0.tar.gz opencv-gcc6-fix-pch-support-PR8345.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv-qt5.spec ++++++ --- /var/tmp/diff_new_pack.BCGtFM/_old 2017-06-12 15:13:11.583224547 +0200 +++ /var/tmp/diff_new_pack.BCGtFM/_new 2017-06-12 15:13:11.583224547 +0200 @@ -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 @@ Source1: opencv_contrib_face-3.1.0.tar.bz2 # PATCH-FIX-OPENSUSE opencv-qt5-sobump.diff [email protected] -- 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 [email protected] -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 @@ %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 @@ %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 @@ %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 @@ %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 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 @@ -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 @@ 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 ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.BCGtFM/_old 2017-06-12 15:13:11.607221161 +0200 +++ /var/tmp/diff_new_pack.BCGtFM/_new 2017-06-12 15:13:11.611220596 +0200 @@ -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 @@ 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 [email protected] -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 @@ %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 @@ %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 @@ %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 @@ %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 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 @@ -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 @@ 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 ++++++ 3.1.0.tar.gz -> 3.2.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/opencv/3.1.0.tar.gz /work/SRC/openSUSE:Factory/.opencv.new/3.2.0.tar.gz differ: char 12, line 1 ++++++ opencv-build-compare.patch ++++++ --- /var/tmp/diff_new_pack.BCGtFM/_old 2017-06-12 15:13:11.667212696 +0200 +++ /var/tmp/diff_new_pack.BCGtFM/_new 2017-06-12 15:13:11.667212696 +0200 @@ -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}") ++++++ opencv-gcc6-fix-pch-support-PR8345.patch ++++++ >From 583e3a68758f02060099994b1fd41b823ddc2bab Mon Sep 17 00:00:00 2001 From: Christof Kaufmann <[email protected]> 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()
