Hello community, here is the log from the commit of package opencv3 for openSUSE:Factory checked in at 2020-06-23 21:03:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv3 (Old) and /work/SRC/openSUSE:Factory/.opencv3.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv3" Tue Jun 23 21:03:16 2020 rev:8 rq:815966 version:3.4.10 Changes: -------- --- /work/SRC/openSUSE:Factory/opencv3/opencv3.changes 2020-02-29 21:18:42.162041935 +0100 +++ /work/SRC/openSUSE:Factory/.opencv3.new.2956/opencv3.changes 2020-06-23 21:03:41.377667265 +0200 @@ -1,0 +2,17 @@ +Fri Jun 19 12:27:16 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update to 3.4.10 + For details, see https://github.com/opencv/opencv/wiki/ChangeLog#version3410 +- Remove obsolete patches: + * opencv-gles.patch + * 0001-Do-not-include-glx.h-when-using-GLES.patch + * opencv-gcc10.patch +- Disable Python 2 bindings for Tumbleweed + +------------------------------------------------------------------- +Wed Jun 3 07:17:20 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Fix build with GCC10: + * opencv-gcc10.patch + +------------------------------------------------------------------- Old: ---- 0001-Do-not-include-glx.h-when-using-GLES.patch opencv-3.4.9.tar.gz opencv-gles.patch opencv_contrib-3.4.9.tar.gz New: ---- opencv-3.4.10.tar.gz opencv_contrib-3.4.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv3.spec ++++++ --- /var/tmp/diff_new_pack.WrBsZ3/_old 2020-06-23 21:03:48.517690238 +0200 +++ /var/tmp/diff_new_pack.WrBsZ3/_new 2020-06-23 21:03:48.517690238 +0200 @@ -1,7 +1,7 @@ # # spec file for package opencv3 # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,26 @@ # +%define srcname opencv +%define libname lib%{srcname} +%define soname 3_4 # Build failure with LTO enabled on ppc64le boo#1146096 %ifarch ppc64le %define _lto_cflags %{nil} %endif - -%define srcname opencv -%define libname lib%{srcname} -%define soname 3_4 # disabled by default as many fail %bcond_with tests %bcond_without qt5 %bcond_without ffmpeg +%if 0%{?suse_version} < 1550 %bcond_without python2 +%else +%bcond_with python2 +%endif %bcond_without python3 %bcond_without openblas - Name: opencv3 -Version: 3.4.9 +Version: 3.4.10 Release: 0 Summary: Collection of algorithms for computer vision # GPL-2.0 AND Apache-2.0 files are in 3rdparty/ittnotify which is not build @@ -43,12 +45,8 @@ Source0: https://github.com/opencv/opencv/archive/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz # This is the FACE module from the opencv_contrib package. Packaged separately to prevent too much unstable modules Source1: https://github.com/opencv/opencv_contrib/archive/%{version}.tar.gz#/opencv_contrib-%{version}.tar.gz -# PATCH-FIX-OPENCSUSE opencv-gles.patch -- Make sure PERSPECTIVE_CORRECTION_HINT is validated first, https://github.com/opencv/opencv/issues/9171 -Patch0: opencv-gles.patch # PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes Patch1: opencv-build-compare.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, https://github.com/opencv/opencv/issues/9171 -Patch2: 0001-Do-not-include-glx.h-when-using-GLES.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: libeigen3-devel @@ -67,9 +65,9 @@ BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libv4lconvert) BuildRequires: pkgconfig(zlib) +Conflicts: opencv Provides: opencv-qt5 = %{version} Obsoletes: opencv-qt5 < %{version} -Conflicts: opencv %if %{with openblas} BuildRequires: openblas-devel %endif @@ -122,9 +120,9 @@ Requires: pkgconfig(sm) Requires: pkgconfig(x11) Requires: pkgconfig(xext) +Conflicts: opencv-devel Provides: opencv-qt5-devel = %{version} Obsoletes: opencv-qt5-devel < %{version} -Conflicts: opencv-devel %description devel This package contains the OpenCV C/C++ library and header files, as well as @@ -135,11 +133,11 @@ Summary: Python 2 bindings for apps which use OpenCV License: BSD-3-Clause Group: Development/Libraries/Python +Conflicts: python2-opencv Provides: python-opencv = %{version}-%{release} Obsoletes: python-opencv < %{version}-%{release} Provides: python-opencv-qt5 = %{version} Obsoletes: python-opencv-qt5 < %{version} -Conflicts: python2-opencv %description -n python2-%{name} This package contains Python 2 bindings for the OpenCV library. @@ -148,9 +146,9 @@ Summary: Python 3 bindings for apps which use OpenCV License: BSD-3-Clause Group: Development/Libraries/Python +Conflicts: python3-opencv Provides: python3-opencv-qt5 = %{version} Obsoletes: python3-opencv-qt5 < %{version} -Conflicts: python3-opencv %description -n python3-%{name} This package contains Python 3 bindings for the OpenCV library. ++++++ opencv-3.4.9.tar.gz -> opencv-3.4.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/opencv3/opencv-3.4.9.tar.gz /work/SRC/openSUSE:Factory/.opencv3.new.2956/opencv-3.4.10.tar.gz differ: char 12, line 1 ++++++ opencv_contrib-3.4.9.tar.gz -> opencv_contrib-3.4.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/opencv3/opencv_contrib-3.4.9.tar.gz /work/SRC/openSUSE:Factory/.opencv3.new.2956/opencv_contrib-3.4.10.tar.gz differ: char 35, line 1
