pool/opencv
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 942495 from home:StefanBruens:branches:science

Browse Source 
- update to 4.5.5, highlights below, for details check
  https://github.com/opencv/opencv/wiki/ChangeLog#version455
  * Audio support as part of VideoCapture API: GStreamer #21264
  * Updated SOVERSION handling rules: #21178
  * DNN module patches:
    + Added tests to cover ONNX conformance test suite: #21088
    + Improved layers / activations / supported more models
    + Upgraded builtin protobuf from 3.5.2 to 3.19.1
    + More optimizations for RISC-V platform
    + Intel® Inference Engine backend ( OpenVINO™ ):
            added support for OpenVINO 2021.4.2 LTS release
  * G-API module:
    + G-API framework:
      - Fixed issue with accessing 1D data from cv::RMat: #21103
      - Restricted passing the G-API types to graph inputs/outputs
        for execution: #21041
      - Various fixes in G-API Doxygen reference: #20924
      - Renamed various internal structures for consistency #20836 #21040
    + Fluid backend:
      - Introduced a better vectorized version of Resize: #20664.
      - Added vectorized version of Multiply kernel: #21024
      - Added vectorized version of Divide kernel: #20914
      - Added vectorized version of AddC kernel: #21119
      - Added vectorized version of SubC kernel: #21158
      - Added vectorized version of MulC kernel: #21177
      - Added vectorized version of SubRC kernel: #21231
      - Enabled SIMD dispatching for AbsDiffC: #21204
    + OpenCL backend:
      - Fixed sporadic test failures in Multiply kernel running
        on GPU: #21205
    + Intel® OpenVINO™ inference backend:
      - Extended ie::Params to support static batch size as input
        to inference: #20856
      - Enabled 2D input tensor support in IE backend: #20925
      - Fixed various issues with imported (pre-compiled)
        networks: #20918
    + Media integration:
      - Introduced a GStreamer-based pipeline source for
        G-API: #20709
      - Completed the integration of Intel® oneVPL as a pipeline
        source for G-API #20773 with device selection #20738,
	asynchronous execution #20901, intial demux support #21022,
	and GPU-side memory allocation via DirectX 11 #21049.
    + Samples:
      - Replaced custom kernels with now-standard G-API operations
        in several samples #21106
      - Moved API snippets from G-API samples to a dedicated
        place #20857
    + Other changes and fixes:
      - Fixed various static analysis issues for OpenVINO 2021.4
        release: #21083 and #21212
      - Fixed various build warnings introduced after OpenVINO
        update: #20937
      - Continued clean-up in the G-API test suite on GTest macros
        #20922 and test data #20995
      - Added custom accuracy comparison functions to Fluid
        performance tests: #21150.
  * And many other contributions:
    + Added QRcode encoder: #17889
    + GSoC - OpenCV.js: Accelerate OpenCV.js DNN via WebNN: #20406
    + Add conventional Bayer naming: #20970
    + (opencv_contrib) Add Radon transform function to ximgproc: #3090
    + (opencv_contrib) New superpixel algorithm (F-DBSCAN): #3093
    + Created Stitching Tool: #21020
    + Improve CCL with new algorithms and tests: #21275
    + (opencv_contrib) Update ArUco tutorial: #3126
- Adjust memory constraints (mostly required for aarch64 on Leap)
- Add 0001-highgui-Fix-unresolved-OpenGL-functions-for-Qt-backe.patch

OBS-URL: https://build.opensuse.org/request/show/942495
OBS-URL: https://build.opensuse.org/package/show/science/opencv?expand=0&rev=28
This commit is contained in:
Stefan Brüns
2021-12-26 01:29:53 +00:00
committed by Git OBS Bridge
parent 09034cc4e1
commit 52a1d28937
8 changed files with 123 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
0001-highgui-Fix-unresolved-OpenGL-functions-for-Qt-backe.patch Normal file
View File

@@ -0,0 +1,35 @@
From 2835c13cbd14f4f41996a2c1f73ef860c89c20f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 26 Dec 2021 00:08:06 +0100
Subject: [PATCH] highgui: Fix unresolved OpenGL functions for Qt backend
The Qt backend directly calls some OpenGL functions (glClear, glHint,
glViewport), but since OCV 4.5.5 the GL libraries are no longer part
of the global extra dependencies. When linking with "-Wl,--no-undefined"
this causes linker errors:
`opencv-4.5.5/modules/highgui/src/window_QT.cpp:3307: undefined reference to `glClear'`
Related issues: #21299
---
modules/highgui/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index 6123ea1436..45e66dfa1e 100644
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -279,6 +279,10 @@ if(OPENCV_HIGHGUI_BUILTIN_BACKEND STREQUAL "WIN32UI" AND HAVE_OPENGL AND OPENGL_
ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}")
endif()
+if(OPENCV_HIGHGUI_BUILTIN_BACKEND MATCHES "^QT" AND HAVE_OPENGL AND OPENGL_LIBRARIES)
+ ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}")
+endif()
+
if(MSVC AND NOT BUILD_SHARED_LIBS AND BUILD_WITH_STATIC_CRT)
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG")
endif()
--
2.34.1

4
_constraints
View File

@@ -5,10 +5,10 @@
<size unit="G">13</size> <size unit="G">13</size>
</disk> </disk>
<memory> <memory>
<size unit="M">5500</size> <size unit="M">5700</size>
</memory> </memory>
<memoryperjob> <memoryperjob>
<size unit="M">1500</size> <size unit="M">1600</size>
</memoryperjob> </memoryperjob>
</hardware> </hardware>
</constraints> </constraints>

3
opencv-4.5.4.tar.gz
View File

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

3
opencv-4.5.5.tar.gz Normal file
View File

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

72
opencv.changes
View File

@@ -1,3 +1,75 @@
-------------------------------------------------------------------
Sat Dec 25 17:43:11 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- update to 4.5.5, highlights below, for details check
https://github.com/opencv/opencv/wiki/ChangeLog#version455
* Audio support as part of VideoCapture API: GStreamer #21264
* Updated SOVERSION handling rules: #21178
* DNN module patches:
+ Added tests to cover ONNX conformance test suite: #21088
+ Improved layers / activations / supported more models
+ Upgraded builtin protobuf from 3.5.2 to 3.19.1
+ More optimizations for RISC-V platform
+ Intel® Inference Engine backend ( OpenVINO™ ):
added support for OpenVINO 2021.4.2 LTS release
* G-API module:
+ G-API framework:
- Fixed issue with accessing 1D data from cv::RMat: #21103
- Restricted passing the G-API types to graph inputs/outputs
for execution: #21041
- Various fixes in G-API Doxygen reference: #20924
- Renamed various internal structures for consistency #20836 #21040
+ Fluid backend:
- Introduced a better vectorized version of Resize: #20664.
- Added vectorized version of Multiply kernel: #21024
- Added vectorized version of Divide kernel: #20914
- Added vectorized version of AddC kernel: #21119
- Added vectorized version of SubC kernel: #21158
- Added vectorized version of MulC kernel: #21177
- Added vectorized version of SubRC kernel: #21231
- Enabled SIMD dispatching for AbsDiffC: #21204
+ OpenCL backend:
- Fixed sporadic test failures in Multiply kernel running
on GPU: #21205
+ Intel® OpenVINO™ inference backend:
- Extended ie::Params to support static batch size as input
to inference: #20856
- Enabled 2D input tensor support in IE backend: #20925
- Fixed various issues with imported (pre-compiled)
networks: #20918
+ Media integration:
- Introduced a GStreamer-based pipeline source for
G-API: #20709
- Completed the integration of Intel® oneVPL as a pipeline
source for G-API #20773 with device selection #20738,
asynchronous execution #20901, intial demux support #21022,
and GPU-side memory allocation via DirectX 11 #21049.
+ Samples:
- Replaced custom kernels with now-standard G-API operations
in several samples #21106
- Moved API snippets from G-API samples to a dedicated
place #20857
+ Other changes and fixes:
- Fixed various static analysis issues for OpenVINO 2021.4
release: #21083 and #21212
- Fixed various build warnings introduced after OpenVINO
update: #20937
- Continued clean-up in the G-API test suite on GTest macros
#20922 and test data #20995
- Added custom accuracy comparison functions to Fluid
performance tests: #21150.
* And many other contributions:
+ Added QRcode encoder: #17889
+ GSoC - OpenCV.js: Accelerate OpenCV.js DNN via WebNN: #20406
+ Add conventional Bayer naming: #20970
+ (opencv_contrib) Add Radon transform function to ximgproc: #3090
+ (opencv_contrib) New superpixel algorithm (F-DBSCAN): #3093
+ Created Stitching Tool: #21020
+ Improve CCL with new algorithms and tests: #21275
+ (opencv_contrib) Update ArUco tutorial: #3126
- Adjust memory constraints (mostly required for aarch64 on Leap)
- Add 0001-highgui-Fix-unresolved-OpenGL-functions-for-Qt-backe.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 24 21:53:53 UTC 2021 - Dirk Müller <dmueller@suse.com> Wed Nov 24 21:53:53 UTC 2021 - Dirk Müller <dmueller@suse.com>

11
opencv.spec
View File

@@ -22,7 +22,7 @@
%endif %endif
%define libname lib%{name} %define libname lib%{name}
%define soname 4_5 %define soname 405
# disabled by default as many fail # disabled by default as many fail
%bcond_with tests %bcond_with tests
%bcond_without gapi %bcond_without gapi
@@ -35,7 +35,7 @@
%bcond_without python3 %bcond_without python3
%bcond_without openblas %bcond_without openblas
Name: opencv Name: opencv
Version: 4.5.4 Version: 4.5.5
Release: 0 Release: 0
Summary: Collection of algorithms for computer vision Summary: Collection of algorithms for computer vision
# GPL-2.0 AND Apache-2.0 files are in 3rdparty/ittnotify which is not build # GPL-2.0 AND Apache-2.0 files are in 3rdparty/ittnotify which is not build
@@ -43,8 +43,10 @@ License: BSD-3-Clause AND GPL-2.0-only AND Apache-2.0
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
URL: https://opencv.org/ URL: https://opencv.org/
Source0: https://github.com/opencv/opencv/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz 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 # Several modules from the opencv_contrib package
Source1: https://github.com/opencv/opencv_contrib/archive/%{version}.tar.gz#/opencv_contrib-%{version}.tar.gz Source1: https://github.com/opencv/opencv_contrib/archive/%{version}.tar.gz#/opencv_contrib-%{version}.tar.gz
# PATCH-FIX-UPSTREAM
Patch0: 0001-highgui-Fix-unresolved-OpenGL-functions-for-Qt-backe.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libeigen3-devel BuildRequires: libeigen3-devel
@@ -76,10 +78,12 @@ BuildRequires: ade-devel >= 0.1.0
BuildRequires: openblas-devel BuildRequires: openblas-devel
%endif %endif
%if %{with python2} %if %{with python2}
BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(python)
BuildRequires: python2-numpy-devel BuildRequires: python2-numpy-devel
%endif %endif
%if %{with python3} %if %{with python3}
BuildRequires: python-rpm-macros
BuildRequires: python3-numpy-devel BuildRequires: python3-numpy-devel
BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(python3)
%endif %endif
@@ -268,6 +272,7 @@ This package contains the documentation and examples for the OpenCV library.
%prep %prep
%setup -q -a 1 %setup -q -a 1
%autopatch -p1
# Only copy over modules we need # Only copy over modules we need
mv opencv_contrib-%{version}/modules/{aruco,face,tracking,optflow,plot,shape,superres,videostab,ximgproc} modules/ mv opencv_contrib-%{version}/modules/{aruco,face,tracking,optflow,plot,shape,superres,videostab,ximgproc} modules/

3
opencv_contrib-4.5.4.tar.gz
View File

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

3
opencv_contrib-4.5.5.tar.gz Normal file
View File

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