Hello community,
here is the log from the commit of package opencv for openSUSE:Factory checked in at 2016-03-05 11:21:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opencv (Old)
and /work/SRC/openSUSE:Factory/.opencv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv"
Changes:
--------
--- /work/SRC/openSUSE:Factory/opencv/opencv-qt5.changes 2016-01-28 17:18:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes 2016-03-05 11:21:26.000000000 +0100
@@ -1,0 +2,135 @@
+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= …”
+ 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.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2016-01-28 17:18:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2016-03-05 11:21:26.000000000 +0100
@@ -1,0 +2,135 @@
+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= …”
+ 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.
+
+-------------------------------------------------------------------
Old:
----
2.4.11.tar.gz
improve-sphinx-search.diff
opencv-altivec-vector.patch
opencv-pkgconfig.patch
opencv-samples.patch
New:
----
3.1.0.tar.gz
_constraints
opencv_contrib_face-3.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opencv-qt5.spec ++++++
--- /var/tmp/diff_new_pack.5zyDYW/_old 2016-03-05 11:21:30.000000000 +0100
+++ /var/tmp/diff_new_pack.5zyDYW/_new 2016-03-05 11:21:30.000000000 +0100
@@ -19,27 +19,20 @@
%bcond_with ffmpeg
%define libname lib%{name}
-%define soname 5_4
+%define soname 6_3
Name: opencv-qt5
-Version: 2.4.11
+Version: 3.1.0
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
Group: Development/Libraries/C and C++
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-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-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
Patch6: opencv-gcc5.patch
# PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES
@@ -48,6 +41,7 @@
Patch8: opencv-build-compare.patch
BuildRequires: cmake
BuildRequires: fdupes
+BuildRequires: unzip
%if 0%{?suse_version} > 1310
BuildRequires: gstreamer-plugins-base-devel
%else
@@ -62,11 +56,12 @@
BuildRequires: libeigen2-devel
%endif
%if %{with ffmpeg}
-BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
-BuildRequires: pkgconfig(libswscale)
+BuildRequires: pkgconfig(libavcodec) >= 57
+BuildRequires: pkgconfig(libavformat) >= 57
+BuildRequires: pkgconfig(libavutil) >= 55
+BuildRequires: pkgconfig(libswscale) >= 4
%endif
+BuildRequires: libgphoto2-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
@@ -151,20 +146,14 @@
This package contains the documentation and examples for the OpenCV library.
%prep
-%setup -q -n opencv-%version
+%setup -q -n opencv-%version -a 1
%patch0 -p1
-%patch1 -p1
-%patch3 -p0
-#%patch4 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
# Remove Windows specific files
rm -f doc/packaging.txt
-# Fix "wrong-file-end-of-line-encoding" rpmlint warning
-sed -i 's/\r$//' samples/c/facedetect.cmd
%build
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
@@ -183,6 +172,7 @@
-DWITH_OPENGL=ON \
-DWITH_UNICAP=ON \
-DWITH_XINE=ON \
+ -DWITH_IPP=OFF \
%if 0%{?suse_version} <= 1310
-DWITH_GSTREAMER_0_10=ON \
%endif
@@ -197,17 +187,11 @@
%install
cd build
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
-%endif
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
# Fix rpmlint warning "doc-file-dependency"
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}%{_includedir}
@@ -237,7 +221,6 @@
%files -n python-%name
%defattr(-,root,root,-)
-%{python_sitearch}/cv.py
%{python_sitearch}/cv2.so
%files doc
++++++ opencv.spec ++++++
--- /var/tmp/diff_new_pack.5zyDYW/_old 2016-03-05 11:21:30.000000000 +0100
+++ /var/tmp/diff_new_pack.5zyDYW/_new 2016-03-05 11:21:30.000000000 +0100
@@ -19,31 +19,25 @@
%bcond_with ffmpeg
%define libname lib%{name}
-%define soname 2_4
+%define soname 3_1
Name: opencv
-Version: 2.4.11
+Version: 3.1.0
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
Group: Development/Libraries/C and C++
Url: http://opencv.org/
Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
-# 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
+# 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
BuildRequires: cmake
BuildRequires: fdupes
+BuildRequires: unzip
%if 0%{?suse_version} > 1310
BuildRequires: gstreamer-plugins-base-devel
%else
@@ -58,11 +52,12 @@
BuildRequires: libeigen2-devel
%endif
%if %{with ffmpeg}
-BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
-BuildRequires: pkgconfig(libswscale)
+BuildRequires: pkgconfig(libavcodec) >= 57
+BuildRequires: pkgconfig(libavformat) >= 57
+BuildRequires: pkgconfig(libavutil) >= 55
+BuildRequires: pkgconfig(libswscale) >= 4
%endif
+BuildRequires: libgphoto2-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libqt4-devel
@@ -139,18 +134,14 @@
This package contains the documentation and examples for the OpenCV library.
%prep
-%setup -q
-%patch1 -p1
-%patch3 -p0
-#%patch4 -p1
-%patch5 -p1
+%setup -q -a 1
%patch6 -p1
%patch8 -p1
# Remove Windows specific files
rm -f doc/packaging.txt
# 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
export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
@@ -169,6 +160,7 @@
-DWITH_OPENGL=ON \
-DWITH_UNICAP=ON \
-DWITH_XINE=ON \
+ -DWITH_IPP=OFF \
%if 0%{?suse_version} <= 1310
-DWITH_GSTREAMER_0_10=ON \
%endif
@@ -183,17 +175,11 @@
%install
cd build
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
-%endif
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
# Fix rpmlint warning "doc-file-dependency"
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}%{_includedir}
@@ -223,7 +209,6 @@
%files -n python-%name
%defattr(-,root,root,-)
-%{python_sitearch}/cv.py
%{python_sitearch}/cv2.so
%files doc
++++++ 2.4.11.tar.gz -> 3.1.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/opencv/2.4.11.tar.gz /work/SRC/openSUSE:Factory/.opencv.new/3.1.0.tar.gz differ: char 12, line 1
++++++ opencv-build-compare.patch ++++++
--- /var/tmp/diff_new_pack.5zyDYW/_old 2016-03-05 11:21:30.000000000 +0100
+++ /var/tmp/diff_new_pack.5zyDYW/_new 2016-03-05 11:21:30.000000000 +0100
@@ -1,13 +1,6 @@
----
- CMakeLists.txt | 4 ++--
- cmake/OpenCVUtils.cmake | 3 +++
- 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()
+--- 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:")
@@ -21,11 +14,9 @@
status(" CMake generator:" ${CMAKE_GENERATOR})
status(" CMake build tool:" ${CMAKE_BUILD_TOOL})
if(MSVC)
-Index: opencv-2.4.11/cmake/OpenCVUtils.cmake
-===================================================================
---- opencv-2.4.11.orig/cmake/OpenCVUtils.cmake
-+++ opencv-2.4.11/cmake/OpenCVUtils.cmake
-@@ -319,15 +319,18 @@ function(status text)
+--- 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 @@
if(${status_cond})
string(REPLACE ";" " " status_then "${status_then}")
string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")
++++++ opencv-gcc5.patch ++++++
--- /var/tmp/diff_new_pack.5zyDYW/_old 2016-03-05 11:21:30.000000000 +0100
+++ /var/tmp/diff_new_pack.5zyDYW/_new 2016-03-05 11:21:30.000000000 +0100
@@ -1,8 +1,6 @@
-Index: opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
-===================================================================
---- opencv-2.4.11.orig/cmake/OpenCVDetectCXXCompiler.cmake
-+++ opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
-@@ -68,6 +68,10 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
+--- 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)
++++++ opencv-gles.patch ++++++
--- /var/tmp/diff_new_pack.5zyDYW/_old 2016-03-05 11:21:30.000000000 +0100
+++ /var/tmp/diff_new_pack.5zyDYW/_new 2016-03-05 11:21:30.000000000 +0100
@@ -1,11 +1,6 @@
-If Qt5 is configured with -opengl es2 then <QtOpenGL> doesn't define
-GL_PERSPECTIVE_CORRECTION_HINT.
-
-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()
+--- 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()
{
++++++ opencv-qt5-sobump.diff ++++++
--- /var/tmp/diff_new_pack.5zyDYW/_old 2016-03-05 11:21:30.000000000 +0100
+++ /var/tmp/diff_new_pack.5zyDYW/_new 2016-03-05 11:21:30.000000000 +0100
@@ -1,12 +1,17 @@
-diff -urB opencv-2.4.9/cmake/OpenCVVersion.cmake new/cmake/OpenCVVersion.cmake
---- opencv-2.4.9/cmake/OpenCVVersion.cmake 2014-04-11 12:15:26.000000000 +0200
-+++ new/cmake/OpenCVVersion.cmake 2015-01-03 19:56:37.829234402 +0100
-@@ -1,7 +1,7 @@
+--- opencv-3.1.0.orig/cmake/OpenCVVersion.cmake 2015-12-18 16:02:16.000000000 +0100
++++ opencv-3.1.0/cmake/OpenCVVersion.cmake 2016-02-27 15:38:45.228901282 +0100
+@@ -1,10 +1,10 @@
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}")