Accepting request 738095 from home:StefanBruens:branches:science

- Update to 4.1.2
  * DNN module:
    + Intel Inference Engine backend (OpenVINO):
      - 2019R3 has been supported
      - Support modern IE Core API
      - New approach for custom layers management. Now all the OpenCV
        layers fallbacks are implemented as IE custom layers which
        helps to improve efficiency due less graph partitioning.
      - High-level API which introduces dnn::Model class and set of
        task-specific classes such dnn::ClassificationModel,
        dnn::DetectionModel, dnn::SegmentationModel. It supports
        automatic pre- and post-processing for deep learning networks.
  * Performance improvements and platforms support:
    + MSA SIMD implementation has been contributed for MIPS platforms:
      https://github.com/opencv/opencv/pull/15422
    + OpenCV.js optimization (threading and SIMD as part of GSoC
      project): https://github.com/opencv/opencv/pull/15371
    + More optimizations using SIMD intrinsics: dotProd, FAST corners,
      HOG, LK pyramid (VSX), norm, warpPerspective, etc
    + Fixed detection of Cascade Lake CPUs
  * And many other great patches from OpenCV community:
    + GUI: support topmost window mode (Win32/COCOA):
      https://github.com/opencv/opencv/pull/14872
    + Java: fix Mat.toString() for higher dimensions:
      https://github.com/opencv/opencv/pull/15181
    + Implementation of colormap "Turbo"
      https://github.com/opencv/opencv/pull/15388
    + QR-Code detection accuracy improvement:
      https://github.com/opencv/opencv/pull/15356
    + GSoC: Add learning-based super-resolution module:
      https://github.com/opencv/opencv_contrib/pull/2229 and
      https://github.com/opencv/opencv_contrib/pull/2231
    + Detection accuracy improvement of the white marker aruco
      corners: https://github.com/opencv/opencv_contrib/pull/2236
    + Added pattern generator tool for aruco:
      https://github.com/opencv/opencv_contrib/pull/2250
    + and special thanks to @sturkmen72 for improvind and cleaning
      up code of samples/tutorials
  * Breaking changes:
    + fixed values thresholding accuracy in calcHist()
- Enable Graph API (G-API)
- Minor spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/738095
OBS-URL: https://build.opensuse.org/package/show/science/opencv?expand=0&rev=7

opencv.spec

@@ -20,20 +20,17 @@
 %define _lto_cflags %{nil}
 %endif
 
-# The ADE required for gapi is not yet packaged, disable it for now
-%bcond_with gapi
-
 %define libname lib%{name}
 %define soname 4_1
 # disabled by default as many fail
 %bcond_with tests
-%bcond_without qt5
+%bcond_without gapi
 %bcond_without ffmpeg
 %bcond_without python2
 %bcond_without python3
 %bcond_without openblas
 Name:           opencv
-Version:        4.1.1
+Version:        4.1.2
 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
@@ -80,28 +77,17 @@ BuildRequires:  openblas-devel
 %endif
 %if %{with python2}
 BuildRequires:  pkgconfig(python)
-%if 0%{?suse_version} > 1325
 BuildRequires:  python2-numpy-devel
-%else
-BuildRequires:  python-numpy-devel
-%endif
 %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
-%else
-BuildRequires:  pkgconfig(QtCore)
-BuildRequires:  pkgconfig(QtGui)
-BuildRequires:  pkgconfig(QtOpenGL)
-BuildRequires:  pkgconfig(QtTest)
-%endif
 %if %{with ffmpeg}
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
@@ -241,6 +227,8 @@ rm -f doc/packaging.txt
       -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