Hello community, here is the log from the commit of package opencv3 for openSUSE:Leap:15.2 checked in at 2020-02-20 00:08:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/opencv3 (Old) and /work/SRC/openSUSE:Leap:15.2/.opencv3.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv3" Thu Feb 20 00:08:35 2020 rev:1 rq:775347 version:3.4.9 Changes: -------- New Changes file: --- /dev/null 2019-12-19 10:12:34.003146842 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.opencv3.new.26092/opencv3.changes 2020-02-20 00:08:37.888272386 +0100 @@ -0,0 +1,909 @@ +------------------------------------------------------------------- +Wed Dec 25 01:31:10 UTC 2019 - Stefan Brüns <[email protected]> + +- Update to 3.4.9 + For details, see https://github.com/opencv/opencv/wiki/ChangeLog#version349 + +------------------------------------------------------------------- +Sun Dec 8 23:33:56 UTC 2019 - Stefan Brüns <[email protected]> + +- Update to 3.4.8 + For details, see https://github.com/opencv/opencv/wiki/ChangeLog#version348 + Drop upstream CVE-2019-15939.patch +- Adjust _constraints, fix out-of-disk-space failures + +------------------------------------------------------------------- +Thu Oct 17 16:34:57 UTC 2019 - Michael Gorse <[email protected]> + +- Update to 3.4.7 + Maintenance release, no changelog provided + * Security fixes: CVE-2019-14491 (boo#1144352), CVE-2019-14492 + (boo#1144348). +- Drop fix_processor_detection_for_32bit_on_64bit.patch: fixed + upstream. +- Add CVE-2019-15939.patch: add input check in HOG detector + (boo#1149742 CVE-2019-15939). + +------------------------------------------------------------------- +Fri Sep 13 10:11:25 UTC 2019 - Michel Normand <[email protected]> + +- Disable LTO on ppc64le for now, as it fails to build when enabled + (boo#1146096). + +------------------------------------------------------------------- +Tue Aug 27 10:24:15 UTC 2019 - Jan Engelhardt <[email protected]> + +- Avoid use of ®/™ signs in specfiles as per guidelines. + +------------------------------------------------------------------- +Tue Jul 30 13:39:10 UTC 2019 - Stefan Brüns <[email protected]> + +- Reenable LTO again, fixed in GCC upstream: https://gcc.gnu.org/PR91231 + +------------------------------------------------------------------- +Wed Jul 24 13:56:22 UTC 2019 - Antonio Larrosa <[email protected]> + +- Disable lto to work around an internal compiler error (boo#1142656) + +------------------------------------------------------------------- +Fri Jun 28 15:01:35 UTC 2019 - Stefan Brüns <[email protected]> + +- Update to 3.4.6 + Maintenance release, no changelog provided +- Update to 3.4.5 + Maintenance release, no changelog provided +- Update to 3.4.4 + OpenVINO™ toolkit components were updated to the R4 baseline +- Drop obsolete opencv-lib_suffix.patch + +------------------------------------------------------------------- +Mon Oct 29 10:22:25 UTC 2018 - Christophe Giboudeaux <[email protected]> + +- Update to 3.4.3 + * Compatibility fixes with python 3.7 + * Added a new computational target DNN_TARGET_OPENCL_FP16 + * Extended support of Intel's Inference Engine backend + * Enabled import of Intel's OpenVINO pre-trained networks from + intermediate representation (IR). + * tutorials improvements + Check https://github.com/opencv/opencv/wiki/ChangeLog#version343 + for the complete changelog. +- Drop fix-build-i386-nosse.patch, build-workaround-issues-with-c.patch + (fixed upstream) +- Refresh patches + +------------------------------------------------------------------- +Tue May 29 08:26:53 UTC 2018 - [email protected] + +- Add patch to fix use of headers from C: + * build-workaround-issues-with-c.patch + +------------------------------------------------------------------- +Mon May 28 11:04:23 UTC 2018 - [email protected] + +- Update to 3.4.1: + * Added support for quantized TensorFlow networks + * OpenCV is now able to use Intel DL inference engine as DNN + acceleration backend + * Added AVX-512 acceleration to the performance-critical kernels + * For more information, read + https://github.com/opencv/opencv/wiki/ChangeLog#version341 +- Update contrib modules to 3.4.1: + * No changelog available +- Change mechanism the contrib modules are built +- Include LICENSE of contrib tarball as well +- Build with python3 on >= 15 +- Add patch to fix build on i386 without SSE: + * fix-build-i386-nosse.patch +- Refresh patches: + * fix_processor_detection_for_32bit_on_64bit.patch + * opencv-build-compare.patch +- Mention all libs explicitly +- Rebase 3.4.0 update from [email protected] +- update to 3.4.0 + * Added faster R-CNN support + * Javascript bindings have been extended to + cover DNN module + * DNN has been further accelerated for iGPU + using OpenCL + * On-disk caching of precompiled OpenCL + kernels has been finally implemented + * possible to load and run pre-compiled + OpenCL kernels via T-API + * Bit-exact 8-bit and 16-bit resize has been + implemented (currently supported only + bilinear interpolation) +- update face module to 3.4.0 +- add opencv-lib_suffix.patch, remove LIB_SUFFIX + from OPENCV_LIB_INSTALL_PATH, as CMAKE_INSTALL + _LIBDIR is arch dependent. + +------------------------------------------------------------------- +Mon Mar 12 08:48:12 UTC 2018 - [email protected] + +- Add option to build without openblas + +------------------------------------------------------------------- +Mon Jan 8 09:35:37 UTC 2018 - [email protected] + +- Add conditionals for python2 and python3 to allow us enabling + only desired python variants when needed +- Do not depend on sphinx as py2 and py3 seem to collide there + +------------------------------------------------------------------- +Sat Nov 25 14:29:14 UTC 2017 - [email protected] + +- Readd opencv-gles.patch, it is *not* included upstream; otherwise + build breaks on all GLES Qt5 platforms (armv6l, armv7l, aarch64) +- add fix_processor_detection_for_32bit_on_64bit.patch +- Correctly set optimizations and dynamic dispatch on ARM, use + OpenCV 3.3 syntax on x86. + +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Sat Jul 15 19:14:48 UTC 2017 - [email protected] + +- Add 0001-Do-not-include-glx.h-when-using-GLES.patch + Fix build for 32bit ARM, including both GLES and desktop GL headers + causes incompatible pointer type errors + +------------------------------------------------------------------- +Mon Jun 5 12:15:24 UTC 2017 - [email protected] + +- Add conditional for the qt5/qt4 integration + * This is used only for gui tools, library is not affected +- Add provides/obsoletes for the qt5 packages to allow migration +- Drop patch opencv-qt5-sobump.diff + * Used only by the obsoleted qt5 variant + +------------------------------------------------------------------- +Mon Jun 5 11:29:06 UTC 2017 - [email protected] ++++ 712 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.2/.opencv3.new.26092/opencv3.changes New: ---- 0001-Do-not-include-glx.h-when-using-GLES.patch _constraints opencv-3.4.9.tar.gz opencv-build-compare.patch opencv-gles.patch opencv3.changes opencv3.spec opencv_contrib-3.4.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv3.spec ++++++ # # spec file for package opencv3 # # Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # # 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 %bcond_without python2 %bcond_without python3 %bcond_without openblas Name: opencv3 Version: 3.4.9 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 License: BSD-3-Clause AND GPL-2.0-only AND Apache-2.0 Group: Development/Libraries/C and C++ URL: https://opencv.org/ 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 BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: pkgconfig BuildRequires: tbb-devel BuildRequires: unzip BuildRequires: pkgconfig(IlmBase) BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(libdc1394-2) BuildRequires: pkgconfig(libgphoto2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libv4lconvert) BuildRequires: pkgconfig(zlib) Provides: opencv-qt5 = %{version} Obsoletes: opencv-qt5 < %{version} Conflicts: opencv %if %{with openblas} BuildRequires: openblas-devel %endif %if %{with python2} BuildRequires: python2-numpy-devel BuildRequires: pkgconfig(python) %endif %if %{with python3} BuildRequires: python3-numpy-devel BuildRequires: pkgconfig(python3) %endif %if %{with qt5} BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 %endif %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) %endif %description OpenCV means Intel Open Source Computer Vision Library. It is a collection of C functions and a few C++ classes that implement some popular Image Processing and Computer Vision algorithms. %package -n %{libname}%{soname} Summary: Libraries to use OpenCV computer vision License: BSD-3-Clause Group: System/Libraries %description -n %{libname}%{soname} The Open Computer Vision Library is a collection of algorithms and sample code for various computer vision problems. The library is compatible with IPL and utilizes Intel Integrated Performance Primitives for better performance. %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} Requires: pkgconfig(gl) Requires: pkgconfig(glu) Requires: pkgconfig(ice) Requires: pkgconfig(sm) Requires: pkgconfig(x11) Requires: pkgconfig(xext) 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 documentation. It should be installed if you want to develop programs that will use the OpenCV library. %package -n python2-%{name} Summary: Python 2 bindings for apps which use OpenCV License: BSD-3-Clause Group: Development/Libraries/Python 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. %package -n python3-%{name} Summary: Python 3 bindings for apps which use OpenCV License: BSD-3-Clause Group: Development/Libraries/Python 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. %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 Suggests: %{name}-devel Provides: opencv-qt5-doc = %{version} Obsoletes: opencv-qt5-doc < %{version} %description doc This package contains the documentation and examples for the OpenCV library. %prep %setup -q -n %{srcname}-%{version} -a 1 %autopatch -p1 # Only copy over modules we need mv opencv_contrib-%{version}/modules/{face,tracking,plot} modules/ cp opencv_contrib-%{version}/LICENSE LICENSE.contrib # Remove Windows specific files rm -f doc/packaging.txt %build # Dynamic dispatch: https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options # x86: disable SSE on 32bit, do not dispatch AVX and later - SSE3 # is the highest extension available on any non-64bit x86 CPU # ARM: ARMv6, e.g. RPi1, only has VFPv2 %cmake \ %if %{with tests} -DBUILD_TESTS=ON \ %endif -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DENABLE_OMIT_FRAME_POINTER=OFF \ -DWITH_QT=ON \ -DWITH_OPENGL=ON \ -DWITH_UNICAP=ON \ -DWITH_XINE=ON \ -DWITH_IPP=OFF \ -DWITH_TBB=ON \ %ifarch %{ix86} -DCPU_BASELINE_DISABLE=SSE \ -DCPU_DISPATCH=SSE,SSE2,SSE3 \ %endif %ifarch x86_64 -DCPU_BASELINE=SSE2 \ -DCPU_DISPATCH=SSE3,SSE4_1,SSE4_2,AVX,FP16,AVX2 \ %endif %ifarch %{arm} %ifarch armv7l armv7hl -DCPU_BASELINE=VFPV3 \ -DCPU_DISPATCH=NEON \ %else -DCPU_BASELINE_DISABLE=NEON,VFPV3 \ %endif %endif %ifarch aarch64 -DCPU_BASELINE=NEON \ -DCPU_DISPATCH=FP16 \ %endif %if 0%{?suse_version} >= 1500 -DPYTHON_DEFAULT_EXECUTABLE=%{_bindir}/python3 \ %endif -DOPENCV_SKIP_PYTHON_LOADER=ON \ -DOPENCV_PYTHON2_INSTALL_PATH=%{python2_sitearch} \ -DOPENCV_PYTHON3_INSTALL_PATH=%{python3_sitearch} \ make %{?_smp_mflags} VERBOSE=1 %check %if %{with tests} export LD_LIBRARY_PATH=$(pwd)/build/lib:$LD_LIBRARY_PATH %ctest %endif %install %cmake_install mkdir -p %{buildroot}%{_docdir}/%{name}-doc 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 # Remove LD_LIBRARY_PATH wrapper script, we install into proper library dirs rm %{buildroot}%{_bindir}/setup_vars_opencv3.sh %fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples %fdupes -s %{buildroot}%{_includedir} %post -n %{libname}%{soname} -p /sbin/ldconfig %postun -n %{libname}%{soname} -p /sbin/ldconfig %files %license LICENSE LICENSE.contrib %license %{_licensedir}/%{name}/* %{_bindir}/opencv_* %{_datadir}/OpenCV %exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake %files -n %{libname}%{soname} %license LICENSE LICENSE.contrib %{_libdir}/libopencv_calib3d.so.* %{_libdir}/libopencv_core.so.* %{_libdir}/libopencv_dnn.so.* %{_libdir}/libopencv_face.so.* %{_libdir}/libopencv_features2d.so.* %{_libdir}/libopencv_flann.so.* %{_libdir}/libopencv_highgui.so.* %{_libdir}/libopencv_imgcodecs.so.* %{_libdir}/libopencv_imgproc.so.* %{_libdir}/libopencv_ml.so.* %{_libdir}/libopencv_objdetect.so.* %{_libdir}/libopencv_photo.so.* %{_libdir}/libopencv_plot.so.* %{_libdir}/libopencv_shape.so.* %{_libdir}/libopencv_stitching.so.* %{_libdir}/libopencv_superres.so.* %{_libdir}/libopencv_tracking.so.* %{_libdir}/libopencv_video.so.* %{_libdir}/libopencv_videoio.so.* %{_libdir}/libopencv_videostab.so.* %files devel %license LICENSE LICENSE.contrib %{_includedir}/opencv/ %{_includedir}/opencv2/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/opencv.pc %{_datadir}/OpenCV/OpenCVConfig*.cmake %if %{with python2} %files -n python2-%{name} %license LICENSE LICENSE.contrib %{python_sitearch}/cv2.so %endif %if %{with python3} %files -n python3-%{name} %license LICENSE LICENSE.contrib %{python3_sitearch}/cv2.%{py3_soflags}.so %endif %files doc %{_docdir}/%{name}-doc/ %changelog ++++++ 0001-Do-not-include-glx.h-when-using-GLES.patch ++++++ >From 9be7aaacd55b6264f8b893277f3f44c1f2b37c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <[email protected]> Date: Sat, 15 Jul 2017 21:14:07 +0200 Subject: [PATCH] Do not include glx.h when using GLES --- modules/highgui/src/window_QT.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp index 4cfce66..baea0a2 100644 --- a/modules/highgui/src/window_QT.cpp +++ b/modules/highgui/src/window_QT.cpp @@ -54,9 +54,12 @@ #include <unistd.h> #endif +// Get GL_PERSPECTIVE_CORRECTION_HINT definition, not available in GLES 2 or +// OpenGL 3 core profile or later #ifdef HAVE_QT_OPENGL - #if defined Q_WS_X11 /* Qt4 */ || defined Q_OS_LINUX /* Qt5 */ - #include <GL/glx.h> + #if defined Q_WS_X11 /* Qt4 */ || \ + (!defined(QT_OPENGL_ES_2) && defined Q_OS_LINUX) /* Qt5 with desktop OpenGL */ + #include <GL/gl.h> #endif #endif -- 2.13.2 ++++++ _constraints ++++++ <?xml version="1.0"?> <constraints> <hardware> <disk> <size unit="G">10</size> </disk> </hardware> <overwrite> <conditions> <arch>i586</arch> <arch>x86_64</arch> </conditions> <hardware> <memory> <size unit="M">2500</size> </memory> </hardware> </overwrite> </constraints> ++++++ opencv-build-compare.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c76ec..b9257c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -960,11 +960,11 @@ endif() if(OPENCV_TIMESTAMP) status(" Timestamp:" ${OPENCV_TIMESTAMP}) endif() -status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}) +status(" Host:" "Linux") if(CMAKE_CROSSCOMPILING) status(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}) endif() -status(" CMake:" ${CMAKE_VERSION}) +status(" CMake:" "YES") status(" CMake generator:" ${CMAKE_GENERATOR}) status(" CMake build tool:" ${CMAKE_BUILD_TOOL}) if(MSVC) diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake index fae91c1..89bfd0d 100644 --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake @@ -804,15 +804,18 @@ function(status text) if(${status_cond}) string(REPLACE ";" " " status_then "${status_then}") string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}") + string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_then "${status_then}") ocv_output_status("${status_text} ${status_then}") else() string(REPLACE ";" " " status_else "${status_else}") string(REGEX REPLACE "^[ \t]+" "" status_else "${status_else}") + string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_else "${status_else}") ocv_output_status("${status_text} ${status_else}") endif() else() string(REPLACE ";" " " status_cond "${status_cond}") string(REGEX REPLACE "^[ \t]+" "" status_cond "${status_cond}") + string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_cond "${status_cond}") ocv_output_status("${status_text} ${status_cond}") endif() else() ++++++ opencv-gles.patch ++++++ diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp index 9425c7b..9e3c156 100644 --- a/modules/highgui/src/window_QT.cpp +++ b/modules/highgui/src/window_QT.cpp @@ -3226,7 +3226,9 @@ void OpenGlViewPort::updateGl() void OpenGlViewPort::initializeGL() { +#ifdef GL_PERSPECTIVE_CORRECTION_HINT glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); +#endif } void OpenGlViewPort::resizeGL(int w, int h)
