Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2018-11-06 15:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opencv" Tue Nov 6 15:18:16 2018 rev:72 rq:645238 version:3.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2018-06-02 11:53:18.645441866 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2018-11-06 15:19:40.681021523 +0100 @@ -1,0 +2,16 @@ +Mon Oct 29 10:22:25 UTC 2018 - Christophe Giboudeaux <christophe@krop.fr> + +- 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 + +------------------------------------------------------------------- Old: ---- build-workaround-issues-with-c.patch fix-build-i386-nosse.patch opencv-3.4.1.tar.gz opencv_contrib-3.4.1.tar.gz New: ---- opencv-3.4.3.tar.gz opencv_contrib-3.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.E2CR7s/_old 2018-11-06 15:19:47.497011677 +0100 +++ /var/tmp/diff_new_pack.E2CR7s/_new 2018-11-06 15:19:47.497011677 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,7 +26,7 @@ %bcond_without python3 %bcond_without openblas Name: opencv -Version: 3.4.1 +Version: 3.4.3 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 @@ -37,19 +37,15 @@ # 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 -Patch1: opencv-gles.patch -# PATCH-FIX-UPSTREAM -Patch2: fix-build-i386-nosse.patch -# PATCH-FIX-UPSTREAM -Patch3: build-workaround-issues-with-c.patch +Patch0: opencv-gles.patch # PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes -Patch8: opencv-build-compare.patch +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 -Patch11: 0001-Do-not-include-glx.h-when-using-GLES.patch +Patch2: 0001-Do-not-include-glx.h-when-using-GLES.patch # PATCH-FIX-OPENSUSE fix_processor_detection_for_32bit_on_64bit.patch -- Fix CPU detection for 32bit build on qemu-system-aarch64 -Patch12: fix_processor_detection_for_32bit_on_64bit.patch +Patch3: fix_processor_detection_for_32bit_on_64bit.patch # PATCH-FIX-OPENSUSE remove LIB_SUFFIX from OPENCV_LIB_INSTALL_PATH because CMAKE_INSTALL_LIBDIR is arch dependent -Patch13: opencv-lib_suffix.patch +Patch4: opencv-lib_suffix.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: libeigen3-devel ++++++ fix_processor_detection_for_32bit_on_64bit.patch ++++++ --- /var/tmp/diff_new_pack.E2CR7s/_old 2018-11-06 15:19:47.525011637 +0100 +++ /var/tmp/diff_new_pack.E2CR7s/_new 2018-11-06 15:19:47.525011637 +0100 @@ -1,8 +1,8 @@ -Index: opencv-3.4.1/cmake/OpenCVDetectCXXCompiler.cmake -=================================================================== ---- opencv-3.4.1.orig/cmake/OpenCVDetectCXXCompiler.cmake -+++ opencv-3.4.1/cmake/OpenCVDetectCXXCompiler.cmake -@@ -60,6 +60,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) +diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake +index 8c9ff03..4bedf51 100644 +--- a/cmake/OpenCVDetectCXXCompiler.cmake ++++ b/cmake/OpenCVDetectCXXCompiler.cmake +@@ -83,6 +83,7 @@ if(WIN32 AND CV_GCC) endif() endif() @@ -10,7 +10,7 @@ if(MSVC64 OR MINGW64) set(X86_64 1) elseif(MINGW OR (MSVC AND NOT CMAKE_CROSSCOMPILING)) -@@ -78,11 +79,17 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^ +@@ -101,11 +102,17 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") set(PPC64 1) endif() ++++++ opencv-3.4.1.tar.gz -> opencv-3.4.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/opencv/opencv-3.4.1.tar.gz /work/SRC/openSUSE:Factory/.opencv.new/opencv-3.4.3.tar.gz differ: char 13, line 1 ++++++ opencv-build-compare.patch ++++++ --- /var/tmp/diff_new_pack.E2CR7s/_old 2018-11-06 15:19:47.569011573 +0100 +++ /var/tmp/diff_new_pack.E2CR7s/_new 2018-11-06 15:19:47.569011573 +0100 @@ -1,8 +1,8 @@ -Index: opencv-3.4.1/CMakeLists.txt -=================================================================== ---- opencv-3.4.1.orig/CMakeLists.txt -+++ opencv-3.4.1/CMakeLists.txt -@@ -966,11 +966,11 @@ endif() +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() @@ -16,11 +16,11 @@ status(" CMake generator:" ${CMAKE_GENERATOR}) status(" CMake build tool:" ${CMAKE_BUILD_TOOL}) if(MSVC) -Index: opencv-3.4.1/cmake/OpenCVUtils.cmake -=================================================================== ---- opencv-3.4.1.orig/cmake/OpenCVUtils.cmake -+++ opencv-3.4.1/cmake/OpenCVUtils.cmake -@@ -730,15 +730,18 @@ function(status text) +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}") ++++++ opencv-gles.patch ++++++ --- /var/tmp/diff_new_pack.E2CR7s/_old 2018-11-06 15:19:47.581011556 +0100 +++ /var/tmp/diff_new_pack.E2CR7s/_new 2018-11-06 15:19:47.581011556 +0100 @@ -1,6 +1,8 @@ ---- 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 @@ +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() { ++++++ opencv-lib_suffix.patch ++++++ --- /var/tmp/diff_new_pack.E2CR7s/_old 2018-11-06 15:19:47.593011539 +0100 +++ /var/tmp/diff_new_pack.E2CR7s/_new 2018-11-06 15:19:47.593011539 +0100 @@ -1,8 +1,8 @@ -Index: opencv-3.4.0/CMakeLists.txt -=================================================================== ---- opencv-3.4.0.orig/CMakeLists.txt -+++ opencv-3.4.0/CMakeLists.txt -@@ -421,7 +421,7 @@ else() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b9257c6..f26a83c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -445,7 +445,7 @@ else() ocv_update(OPENCV_CONFIG_INSTALL_PATH ".") else() include(GNUInstallDirs) @@ -11,7 +11,7 @@ ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}) ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples) ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java) -@@ -430,7 +430,7 @@ else() +@@ -454,7 +454,7 @@ else() if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH) math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) @@ -20,4 +20,3 @@ else() ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) endif() - ++++++ opencv_contrib-3.4.1.tar.gz -> opencv_contrib-3.4.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/opencv/opencv_contrib-3.4.1.tar.gz /work/SRC/openSUSE:Factory/.opencv.new/opencv_contrib-3.4.3.tar.gz differ: char 26, line 1