Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opencv ver. bump

Browse Source
This commit is contained in:
Rmys
2021-12-09 16:14:19 +03:00
committed by GitHub
parent 68da180b56
commit 2c8972f763
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
science/robotics/opencv/actions.py
+1 -1
View File
@@ -63,7 +63,7 @@ def setup():
-DBUILD_opencv_java_bindings_generator=OFF \
-DPYTHON3_EXECUTABLE=/usr/bin/python3 \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-%s/modules \
-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%s/modules \
" % (get.installDIR(), get.srcVERSION()), sourceDir="..")
# -DUSE_O3=OFF
# -DUSE_OMIT_FRAME_POINTER=OFF
science/robotics/opencv/files/2a4348e0.patch
+22
View File
@@ -0,0 +1,22 @@
From 2a4348e07cdcf59c134b3a2850ef57f617b6224f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Thu, 14 Oct 2021 11:57:41 +0100
Subject: [PATCH] opencv-4.5.4 enable_cvv fixes #3063
The cvv module is compiled conditionally on HAVE_QT5. But in opencv commit 87d4970e8b4b3251035fdf4a0101335ee5904a58 this variable was renamed to HAVE_QT, so the module is never compiled.
Also check if QT_VERSION_MAJOR >= 5
---
modules/cvv/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/opencv_contrib-4.5.4/modules/cvv/CMakeLists.txt b/opencv_contrib-4.5.4/modules/cvv/CMakeLists.txt
index 709464ee896..c264ef1eada 100644
--- a/opencv_contrib-4.5.4/modules/cvv/CMakeLists.txt
+++ b/opencv_contrib-4.5.4/modules/cvv/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT HAVE_QT5 OR NOT HAVE_CXX11)
+if(NOT HAVE_QT OR NOT HAVE_CXX11 OR QT_VERSION_MAJOR LESS 5)
ocv_module_disable(cvv)
return()
endif()
science/robotics/opencv/pspec.xml
+10 -2
View File
@@ -12,8 +12,8 @@
<IsA>library</IsA>
<Summary>Computer vision library</Summary>
<Description>opencv is a programming library mainly aimed at the real time computer vision. Example applications are human-computer interaction, object identification, face recognition, motion tracking, mobile robotics.</Description>
<Archive sha1sum="3e464886dc9907e879e2fc7097364427e96861f6" type="targz" name="opencv-4.5.1.tar.gz">https://github.com/opencv/opencv/archive/4.5.1.tar.gz</Archive>
<Archive sha1sum="190a3b56ae96a839f8db43a9ed8b7de7375ebed2" type="targz" name="opencv_contrib-4.5.1.tar.gz">https://github.com/opencv/opencv_contrib/archive/4.5.1.tar.gz</Archive>
<Archive sha1sum="db7943672bca1baeb08bf3290b1fddd2fd96e5c3" type="targz" name="opencv-4.5.4.tar.gz">https://github.com/opencv/opencv/archive/4.5.4.tar.gz</Archive>
<Archive sha1sum="7e81c9132e779c5c0f49549fc48206e2c5889bed" type="targz" target="opencv-4.5.4" name="opencv_contrib-4.5.4.tar.gz">https://github.com/opencv/opencv_contrib/archive/4.5.4.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>hdf5-devel</Dependency>
@@ -52,6 +52,7 @@
<Dependency>openjpeg2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">2a4348e0.patch</Patch>
</Patches>
</Source>
@@ -118,6 +119,13 @@
</Package>
<History>
<Update release="15">
<Date>2021-12-09</Date>
<Version>4.5.4</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2021-10-23</Date>
<Version>4.5.1</Version>