From e8697038be2cfae38f0b9d275fa2b3a7180fd20c9446839a24db6f565d89363c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Nov 2018 14:18:16 +0000 Subject: [PATCH] Accepting request 645238 from KDE:Extra Update to 3.4.3 OBS-URL: https://build.opensuse.org/request/show/645238 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=72 --- build-workaround-issues-with-c.patch | 56 ------------------- fix-build-i386-nosse.patch | 27 --------- ...ocessor_detection_for_32bit_on_64bit.patch | 12 ++-- opencv-3.4.1.tar.gz | 3 - opencv-3.4.3.tar.gz | 3 + opencv-build-compare.patch | 20 +++---- opencv-gles.patch | 8 ++- opencv-lib_suffix.patch | 13 ++--- opencv.changes | 16 ++++++ opencv.spec | 18 +++--- opencv_contrib-3.4.1.tar.gz | 3 - opencv_contrib-3.4.3.tar.gz | 3 + 12 files changed, 56 insertions(+), 126 deletions(-) delete mode 100644 build-workaround-issues-with-c.patch delete mode 100644 fix-build-i386-nosse.patch delete mode 100644 opencv-3.4.1.tar.gz create mode 100644 opencv-3.4.3.tar.gz delete mode 100644 opencv_contrib-3.4.1.tar.gz create mode 100644 opencv_contrib-3.4.3.tar.gz diff --git a/build-workaround-issues-with-c.patch b/build-workaround-issues-with-c.patch deleted file mode 100644 index f92f524..0000000 --- a/build-workaround-issues-with-c.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 549b5df22520b60b91dd77096434d79425b31ac2 Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin -Date: Mon, 28 May 2018 18:07:23 +0300 -Subject: [PATCH] build: workaround issues with C compilation mode - -- cvdef.h + cvRound (double only) -- highgui_c.h ---- - modules/core/include/opencv2/core/cvdef.h | 8 +++++++- - modules/highgui/include/opencv2/highgui/highgui_c.h | 2 ++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h -index a87ced09d78..4ab72b34cc1 100644 ---- a/modules/core/include/opencv2/core/cvdef.h -+++ b/modules/core/include/opencv2/core/cvdef.h -@@ -480,7 +480,7 @@ Cv64suf; - // Integer types portatibility - #ifdef OPENCV_STDINT_HEADER - #include OPENCV_STDINT_HEADER --#else -+#elif defined(__cplusplus) - #if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */ - namespace cv { - typedef signed char int8_t; -@@ -517,9 +517,15 @@ typedef ::int64_t int64_t; - typedef ::uint64_t uint64_t; - } - #endif -+#else // pure C -+#include - #endif - - - //! @} - -+#ifndef __cplusplus -+#include "opencv2/core/fast_math.hpp" // define cvRound(double) -+#endif -+ - #endif // OPENCV_CORE_CVDEF_H -diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h -index 1eb414a76ca..35413139c79 100644 ---- a/modules/highgui/include/opencv2/highgui/highgui_c.h -+++ b/modules/highgui/include/opencv2/highgui/highgui_c.h -@@ -135,8 +135,10 @@ CVAPI(int) cvNamedWindow( const char* name, int flags CV_DEFAULT(CV_WINDOW_AUTOS - CVAPI(void) cvSetWindowProperty(const char* name, int prop_id, double prop_value); - CVAPI(double) cvGetWindowProperty(const char* name, int prop_id); - -+#ifdef __cplusplus // FIXIT remove in OpenCV 4.0 - /* Get window image rectangle coordinates, width and height */ - CVAPI(cv::Rect)cvGetWindowImageRect(const char* name); -+#endif - - /* display image within window (highgui windows remember their content) */ - CVAPI(void) cvShowImage( const char* name, const CvArr* image ); diff --git a/fix-build-i386-nosse.patch b/fix-build-i386-nosse.patch deleted file mode 100644 index b103880..0000000 --- a/fix-build-i386-nosse.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7dc162cb4252ccf461f1c63650abde3c8807b79c Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin -Date: Mon, 9 Apr 2018 18:25:51 +0300 -Subject: [PATCH] core: fix mm_pause() for non-SSE i386 builds - -replaced to safe binary compatible 'rep; nop' asm instruction ---- - modules/core/src/parallel_impl.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/modules/core/src/parallel_impl.cpp b/modules/core/src/parallel_impl.cpp -index 78d9eb63694..bc64fce7a81 100644 ---- a/modules/core/src/parallel_impl.cpp -+++ b/modules/core/src/parallel_impl.cpp -@@ -49,7 +49,11 @@ DECLARE_CV_YIELD - DECLARE_CV_PAUSE - #endif - #ifndef CV_PAUSE --#if defined __GNUC__ && (defined __i386__ || defined __x86_64__) -+# if defined __GNUC__ && (defined __i386__ || defined __x86_64__) -+# if !defined(__SSE__) -+ static inline void cv_non_sse_mm_pause() { __asm__ __volatile__ ("rep; nop"); } -+# define _mm_pause cv_non_sse_mm_pause -+# endif - # define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { _mm_pause(); } } while (0) - # elif defined __GNUC__ && defined __aarch64__ - # define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { asm volatile("yield" ::: "memory"); } } while (0) diff --git a/fix_processor_detection_for_32bit_on_64bit.patch b/fix_processor_detection_for_32bit_on_64bit.patch index 0bbc7a0..d484c40 100644 --- a/fix_processor_detection_for_32bit_on_64bit.patch +++ b/fix_processor_detection_for_32bit_on_64bit.patch @@ -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 @@ Index: opencv-3.4.1/cmake/OpenCVDetectCXXCompiler.cmake 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() diff --git a/opencv-3.4.1.tar.gz b/opencv-3.4.1.tar.gz deleted file mode 100644 index 83e9826..0000000 --- a/opencv-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852 -size 87051748 diff --git a/opencv-3.4.3.tar.gz b/opencv-3.4.3.tar.gz new file mode 100644 index 0000000..3be1ed5 --- /dev/null +++ b/opencv-3.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec +size 87598899 diff --git a/opencv-build-compare.patch b/opencv-build-compare.patch index a82faff..613da63 100644 --- a/opencv-build-compare.patch +++ b/opencv-build-compare.patch @@ -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 @@ Index: opencv-3.4.1/CMakeLists.txt 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}") diff --git a/opencv-gles.patch b/opencv-gles.patch index 1f9786c..3e0b23d 100644 --- a/opencv-gles.patch +++ b/opencv-gles.patch @@ -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() { diff --git a/opencv-lib_suffix.patch b/opencv-lib_suffix.patch index b884541..fa2c749 100644 --- a/opencv-lib_suffix.patch +++ b/opencv-lib_suffix.patch @@ -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 @@ Index: opencv-3.4.0/CMakeLists.txt 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 @@ Index: opencv-3.4.0/CMakeLists.txt else() ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) endif() - diff --git a/opencv.changes b/opencv.changes index e72285c..06d4637 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Oct 29 10:22:25 UTC 2018 - Christophe Giboudeaux + +- 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 - fabian@ritter-vogt.de diff --git a/opencv.spec b/opencv.spec index 59c1343..f7fe6a4 100644 --- a/opencv.spec +++ b/opencv.spec @@ -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 @@ Source0: https://github.com/opencv/opencv/archive/%{version}.tar.gz#/%{na # 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 diff --git a/opencv_contrib-3.4.1.tar.gz b/opencv_contrib-3.4.1.tar.gz deleted file mode 100644 index 5663f03..0000000 --- a/opencv_contrib-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e -size 57126844 diff --git a/opencv_contrib-3.4.3.tar.gz b/opencv_contrib-3.4.3.tar.gz new file mode 100644 index 0000000..6328493 --- /dev/null +++ b/opencv_contrib-3.4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636 +size 57247006