Accepting request 722327 from science

OBS-URL: https://build.opensuse.org/request/show/722327
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=74

0001-Handle-absolute-OPENCV_INCLUDE_INSTALL_PATH-correctl.patch

@@ -1,42 +0,0 @@
-From 16088f02b282cf2c7d94bc2a599f2e98b2ba4f29 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Fri, 28 Jun 2019 15:36:18 +0200
-Subject: [PATCH] Handle absolute OPENCV_INCLUDE_INSTALL_PATH correctly
-
-In case OPENCV_INCLUDE_INSTALL_PATH is absolute (i.e. starts with a "/"),
-the path ends up with a double "/".
-
-While this is mostly equivalent to a single slash, it may have a nasty
-side effect when:
-- OpenCV_INSTALL_PATH is empty
-- OPENCV_INCLUDE_INSTALL_PATH is "/usr/include"
-- the calling build script uses "-isystem" to specify the path to the
-  headers of dependencies (to avoid warnings)
-
-Specifying "-isystem /usr/include" breaks the path ordering, and GCC can
-no longer find its "stdlib.h", thus CMake filters such statements.
-Unfortunately it fails to do so when using "//usr/include".
----
- cmake/OpenCVGenConfig.cmake | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
-index f452678ad..cef9d0bbc 100644
---- a/cmake/OpenCVGenConfig.cmake
-+++ b/cmake/OpenCVGenConfig.cmake
-@@ -68,7 +68,11 @@ configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.
- #  Part 2/3: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"
- # -------------------------------------------------------------------------------------------
- file(RELATIVE_PATH OpenCV_INSTALL_PATH_RELATIVE_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/${OPENCV_CONFIG_INSTALL_PATH}/" ${CMAKE_INSTALL_PREFIX})
--set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_INCLUDE_INSTALL_PATH}\"")
-+if (IS_ABSOLUTE ${OPENCV_INCLUDE_INSTALL_PATH})
-+  set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"${OPENCV_INCLUDE_INSTALL_PATH}\"")
-+else()
-+  set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_INCLUDE_INSTALL_PATH}\"")
-+endif()
- 
- if(USE_IPPICV)
-   file(RELATIVE_PATH IPPICV_INSTALL_PATH_RELATIVE_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}" "${IPPICV_INSTALL_PATH}")
--- 
-2.22.0
-

_constraints

@@ -3,7 +3,7 @@
   <hardware>
     <disk>
     <!-- build uses 20GB in maintenance projects currently 201502 -->
-	<size unit="G">8</size>
+	<size unit="G">13</size>
     </disk>
   </hardware>
   <overwrite>

fix_processor_detection_for_32bit_on_64bit.patch

@@ -1,35 +0,0 @@
-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()
- 
-+message(STATUS "Detected processor: ${CMAKE_SYSTEM_PROCESSOR}")
- if(MSVC64 OR MINGW64)
-   set(X86_64 1)
- elseif(MINGW OR (MSVC AND NOT CMAKE_CROSSCOMPILING))
-@@ -101,11 +102,17 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-   set(PPC64 1)
- endif()
- 
--# Workaround for 32-bit operating systems on 64-bit x86_64 processor
--if(X86_64 AND CMAKE_SIZEOF_VOID_P EQUAL 4 AND NOT FORCE_X86_64)
--  message(STATUS "sizeof(void) = 4 on x86 / x86_64 processor. Assume 32-bit compilation mode (X86=1)")
--  unset(X86_64)
--  set(X86 1)
-+# Workaround for 32-bit operating systems on x86_64/aarch64 processor
-+if(CMAKE_SIZEOF_VOID_P EQUAL 4 AND NOT FORCE_X86_64)
-+  message(STATUS "sizeof(void) = 4 on 64 bit processor. Assume 32-bit compilation mode")
-+  if (X86_64)
-+    unset(X86_64)
-+    set(X86 1)
-+  endif()
-+  if (AARCH64)
-+    unset(AARCH64)
-+    set(ARM 1)
-+  endif()
- endif()
- 
- # Similar code exists in OpenCVConfig.cmake

opencv-4.1.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f6e4ab393d81d72caae6e78bd0fd6956117ec9f006fba55fcdb88caf62989b7
-size 88206370

opencv-4.1.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5de5d96bdfb9dad6e6061d70f47a0a91cee96bb35afb9afb9ecb3d43e243d217
+size 88427411

opencv-build-compare.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c7c76ec..b9257c6 100644
+index 8631bbc..60352a0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -960,11 +960,11 @@ endif()
+@@ -1099,11 +1099,11 @@ endif()
  if(OPENCV_TIMESTAMP)
    status("    Timestamp:"      ${OPENCV_TIMESTAMP})
  endif()
@@ -17,10 +17,10 @@ index c7c76ec..b9257c6 100644
  status("    CMake build tool:" ${CMAKE_BUILD_TOOL})
  if(MSVC)
 diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
-index fae91c1..89bfd0d 100644
+index 9cba5d9..71f764c 100644
 --- a/cmake/OpenCVUtils.cmake
 +++ b/cmake/OpenCVUtils.cmake
-@@ -804,15 +804,18 @@ function(status text)
+@@ -922,15 +922,18 @@ function(status text)
        if(${status_cond})
          string(REPLACE ";" " " status_then "${status_then}")
          string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")
@@ -39,3 +39,4 @@ index fae91c1..89bfd0d 100644
        ocv_output_status("${status_text} ${status_cond}")
      endif()
    else()
+

opencv-gles.patch

@@ -2,7 +2,7 @@ diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.c
 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()
+@@ -3225,7 +3225,9 @@ void OpenGlViewPort::updateGl()
  
  void OpenGlViewPort::initializeGL()
  {

opencv.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sat Aug 10 21:45:53 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Increase the disk space needed to build opencv.
+
+-------------------------------------------------------------------
+Fri Aug  9 19:56:24 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 4.1.1
+  * DNN module:
+    * 3D convolution networks initial support
+    * A lot of improvements for ONNX and TenforFlow importers
+  * Performance improvements
+  * Added IPPE method for planar pose estimation in solvePnP
+  * Added solvePnPRefineLM and solvePnPRefineVVS
+- Check https://github.com/opencv/opencv/wiki/ChangeLog#version411 for the
+  complete list of changes.
+
+- Drop fix_processor_detection_for_32bit_on_64bit.patch. Fixed upstream
+- Drop 0001-Handle-absolute-OPENCV_INCLUDE_INSTALL_PATH-correctl.patch
+  Fixed upstream
+- Refresh 0001-Do-not-include-glx.h-when-using-GLES.patch and
+  opencv-build-compare.patch.
+
 -------------------------------------------------------------------
 Tue Jul  2 23:06:30 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

opencv.spec

@@ -29,13 +29,13 @@
 %bcond_without python3
 %bcond_without openblas
 Name:           opencv
-Version:        4.1.0
+Version:        4.1.1
 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:            http://opencv.org/
+URL:            https://opencv.org/
 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 unstable modules
 Source1:        https://github.com/opencv/opencv_contrib/archive/%{version}.tar.gz#/opencv_contrib-%{version}.tar.gz
@@ -45,13 +45,6 @@ Patch0:         opencv-gles.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
 Patch2:         0001-Do-not-include-glx.h-when-using-GLES.patch
-# PATCH-FIX-UPSTREAM fix_processor_detection_for_32bit_on_64bit.patch -- Fix CPU detection for 32bit build on qemu-system-aarch64
-Patch3:         fix_processor_detection_for_32bit_on_64bit.patch
-# PATCH-FIX-OPENSUSE
-Patch4:         0001-Handle-absolute-OPENCV_INCLUDE_INSTALL_PATH-correctl.patch
-%if %{with gapi}
-BuildRequires:  ade-devel >= 0.1.0
-%endif
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  libeigen3-devel
@@ -73,6 +66,9 @@ BuildRequires:  pkgconfig(libv4lconvert)
 BuildRequires:  pkgconfig(zlib)
 Provides:       opencv-qt5 = %{version}
 Obsoletes:      opencv-qt5 < %{version}
+%if %{with gapi}
+BuildRequires:  ade-devel >= 0.1.0
+%endif
 %if %{with openblas}
 BuildRequires:  openblas-devel
 %endif
@@ -235,7 +231,7 @@ rm -f doc/packaging.txt
       -DCPU_DISPATCH=FP16 \
 %endif
 %if 0%{?suse_version} >= 1500
-      -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 \
+      -DPYTHON_DEFAULT_EXECUTABLE=%{_bindir}/python3 \
 %endif
       -DOPENCV_SKIP_PYTHON_LOADER=ON \
 

opencv_contrib-4.1.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7d775cc0b87b04308823ca518b11b34cc12907a59af4ccdaf64419c1ba5e682
-size 59752628

opencv_contrib-4.1.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f85d380758498d800fec26307e389620cde8b1a2e86ab51cddc5200fbe37102
+size 59829413