Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2017-11-19 11:08:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Sun Nov 19 11:08:51 2017 rev:68 rq:541269 version:3.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2017-07-25 11:35:35.601037204 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2017-11-19 11:09:18.851931255 +0100 @@ -1,0 +2,38 @@ +Mon Nov 13 09:21:35 UTC 2017 - [email protected] + +- Update licensing information + +------------------------------------------------------------------- +Wed Nov 8 11:21:42 UTC 2017 - [email protected] + +- change requires of python-numpy-devel to build in Leap and + to not break factory in future + +------------------------------------------------------------------- +Sat Nov 4 10:42:02 UTC 2017 - [email protected] + +- fix build error/unresolvable for Leap 42.2 and 42.3 + +------------------------------------------------------------------- +Fri Nov 3 08:34:20 UTC 2017 - [email protected] + +- Update to version 3.3.1: + * Lots of various bugfixes +- Update source url + +------------------------------------------------------------------- +Thu Nov 2 15:06:21 UTC 2017 - [email protected] + +- Rename python subpackage to python2 +- Do not explicitly require python-base for python subpackages + +------------------------------------------------------------------- +Mon Oct 9 05:06:36 UTC 2017 - [email protected] + +- Update to 3.3 +- Dropped obsolete patches + * opencv-gcc6-fix-pch-support-PR8345.patch + * opencv-gles.patch +- Updated opencv-build-compare.patch + +------------------------------------------------------------------- Old: ---- 3.2.0.tar.gz opencv-gcc6-fix-pch-support-PR8345.patch opencv-gles.patch New: ---- opencv-3.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.v0Ae3K/_old 2017-11-19 11:09:20.931855416 +0100 +++ /var/tmp/diff_new_pack.v0Ae3K/_new 2017-11-19 11:09:20.935855270 +0100 @@ -17,27 +17,24 @@ %define libname lib%{name} -%define soname 3_2 +%define soname 3_3 # disabled by default as many fail %bcond_with tests %bcond_without qt5 %bcond_without ffmpeg Name: opencv -Version: 3.2.0 +Version: 3.3.1 Release: 0 Summary: Collection of algorithms for computer vision -License: BSD-3-Clause +# GPL-2.9 AND Apache-2.0 files are in 3rdparty/ittnotify which is not build +License: BSD-3-Clause AND GPL-2.0 AND Apache-2.0 Group: Development/Libraries/C and C++ Url: http://opencv.org/ -Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz +Source0: https://github.com/opencv/opencv/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # This is the FACE module from the opencv_contrib package. Packaged separately to prevent too much usntable modules Source1: opencv_contrib_face-3.1.0.tar.bz2 -# PATCH-FIX-UPSTREAM opencv-gles.patch -- Make sure PERSPECTIVE_CORRECTION_HINT is validated first -Patch1: opencv-gles.patch # PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes Patch8: opencv-build-compare.patch -# PATCH-FIX-UPSTREAM opencv-gcc6-fix-pch-support-PR8345.patch -- fix PCH support on GCC 6.x -Patch10: opencv-gcc6-fix-pch-support-PR8345.patch # PATCH-FIX-OPENSUSE 0001-Do-not-include-glx.h-when-using-GLES.patch -- Fix build error on 32bit ARM, due to incompatible pointer types Patch11: 0001-Do-not-include-glx.h-when-using-GLES.patch BuildRequires: cmake @@ -47,7 +44,11 @@ BuildRequires: libjpeg-devel BuildRequires: openblas-devel BuildRequires: pkgconfig +%if 0%{?suse_version} > 1325 +BuildRequires: python2-numpy-devel +%else BuildRequires: python-numpy-devel +%endif BuildRequires: python3-numpy-devel BuildRequires: tbb-devel BuildRequires: unzip @@ -95,6 +96,7 @@ %package -n %{libname}%{soname} Summary: Libraries to use OpenCV computer vision +License: BSD-3-Clause Group: System/Libraries %description -n %{libname}%{soname} @@ -104,6 +106,7 @@ %package devel Summary: Development files for using the OpenCV library +License: BSD-3-Clause Group: Development/Libraries/C and C++ Requires: %{libname}%{soname} = %{version} Requires: %{name} = %{version} @@ -121,20 +124,22 @@ documentation. It should be installed if you want to develop programs that will use the OpenCV library. -%package -n python-%{name} +%package -n python2-%{name} Summary: Python 2 bindings for apps which use OpenCV +License: BSD-3-Clause Group: Development/Libraries/Python -Requires: python-base +Provides: python-%{name} = %{version}-%{release} +Obsoletes: python-%{name} < %{version}-%{release} Provides: python-%{name}-qt5 Obsoletes: python-%{name}-qt5 -%description -n python-%{name} +%description -n python2-%{name} This package contains Python 2 bindings for the OpenCV library. %package -n python3-%{name} Summary: Python 3 bindings for apps which use OpenCV +License: BSD-3-Clause Group: Development/Libraries/Python -Requires: python3-base Provides: python3-%{name}-qt5 Obsoletes: python3-%{name}-qt5 @@ -143,6 +148,7 @@ %package doc Summary: Documentation and examples for OpenCV +License: BSD-3-Clause Group: Documentation/Other Recommends: python # Since this package also contains examples that need -devel to be compiled @@ -220,7 +226,7 @@ %{_libdir}/pkgconfig/opencv.pc %{_datadir}/OpenCV/OpenCVConfig*.cmake -%files -n python-%{name} +%files -n python2-%{name} %defattr(-,root,root,-) %{python_sitearch}/cv2.so ++++++ opencv-build-compare.patch ++++++ --- /var/tmp/diff_new_pack.v0Ae3K/_old 2017-11-19 11:09:20.963854249 +0100 +++ /var/tmp/diff_new_pack.v0Ae3K/_new 2017-11-19 11:09:20.967854103 +0100 @@ -1,5 +1,5 @@ ---- opencv-3.2.0.orig/CMakeLists.txt 2017-05-28 15:04:38.466895124 +0200 -+++ opencv-3.2.0/CMakeLists.txt 2017-05-28 15:05:23.251389916 +0200 +--- opencv-3.3.0.orig/CMakeLists.txt 2017-05-28 15:04:38.466895124 +0200 ++++ opencv-3.3.0/CMakeLists.txt 2017-05-28 15:05:23.251389916 +0200 @@ -843,11 +843,11 @@ status(" Timestamp:" ${TIMESTAMP}) endif() @@ -14,8 +14,8 @@ status(" CMake generator:" ${CMAKE_GENERATOR}) status(" CMake build tool:" ${CMAKE_BUILD_TOOL}) if(MSVC) ---- opencv-3.2.0.orig/cmake/OpenCVUtils.cmake 2016-12-23 13:54:44.000000000 +0100 -+++ opencv-3.2.0/cmake/OpenCVUtils.cmake 2017-05-28 15:07:42.728928083 +0200 +--- opencv-3.3.0.orig/cmake/OpenCVUtils.cmake 2016-12-23 13:54:44.000000000 +0100 ++++ opencv-3.3.0/cmake/OpenCVUtils.cmake 2017-05-28 15:07:42.728928083 +0200 @@ -550,15 +550,18 @@ if(${status_cond}) string(REPLACE ";" " " status_then "${status_then}")
