opencv, bump version (#9201)

fix build for python
use ffmpeg5
This commit is contained in:
Schrijvers Luc
2023-08-13 16:56:10 +00:00
committed by GitHub
parent c21207d49e
commit 16003f8808
2 changed files with 10 additions and 1017 deletions

View File

@@ -10,14 +10,13 @@ COPYRIGHT="2000-2020, Intel Corporation
2015-2016, Itseez Inc.
2019-2020, Xperience AI"
LICENSE="BSD (3-clause)"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
SOURCE_FILENAME="opencv-$portVersion.tar.gz"
CHECKSUM_SHA256="a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad"
CHECKSUM_SHA256="cbf47ecc336d2bff36b0dcd7d6c179a9bb59e805136af6b9670ca944aef889bd"
SOURCE_URI_2="https://github.com/opencv/opencv_contrib/archive/$portVersion.tar.gz"
SOURCE_FILENAME_2="opencv_contrib-$portVersion.tar.gz"
CHECKSUM_SHA256_2="a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11"
PATCHES="opencv-4.5.5.patchset"
CHECKSUM_SHA256_2="b4aef0f25a22edcd7305df830fa926ca304ea9db65de6ccd02f6cfa5f3357dbb"
ARCHITECTURES="all !x86_gcc2 ?x86"
SECONDARY_ARCHITECTURES="x86"
@@ -38,7 +37,6 @@ PROVIDES="
opencv$secondaryArchSuffix = $portVersionCompat
lib:libopencv_alphamat$secondaryArchSuffix = $libVersionCompat
lib:libopencv_aruco$secondaryArchSuffix = $libVersionCompat
lib:libopencv_barcode$secondaryArchSuffix = $libVersionCompat
lib:libopencv_bgsegm$secondaryArchSuffix = $libVersionCompat
lib:libopencv_bioinspired$secondaryArchSuffix = $libVersionCompat
lib:libopencv_calib3d$secondaryArchSuffix = $libVersionCompat
@@ -136,7 +134,6 @@ PROVIDES_devel="
opencv${secondaryArchSuffix}_devel = $portVersionCompat
devel:libopencv_alphamat$secondaryArchSuffix = $libVersionCompat
devel:libopencv_aruco$secondaryArchSuffix = $libVersionCompat
devel:libopencv_barcode$secondaryArchSuffix = $libVersionCompat
devel:libopencv_bgsegm$secondaryArchSuffix = $libVersionCompat
devel:libopencv_bioinspired$secondaryArchSuffix = $libVersionCompat
devel:libopencv_calib3d$secondaryArchSuffix = $libVersionCompat
@@ -216,7 +213,7 @@ PROVIDES_tools="
REQUIRES_tools="
haiku$secondaryArchSuffix
opencv$secondaryArchSuffix == $portVersion base
numpy${secondaryArchSuffix}_python39
numpy${secondaryArchSuffix}_python310
cmd:python3
"
@@ -224,10 +221,9 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:cblas$secondaryArchSuffix
devel:eigen$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
devel:libavutil$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix >= 59.37.100
devel:libavformat$secondaryArchSuffix >= 59.27.100
devel:libavutil$secondaryArchSuffix >= 57.28.100
# devel:libcaffe$secondaryArchSuffix
# devel:libceres$secondaryArchSuffix
devel:libexif$secondaryArchSuffix
@@ -262,7 +258,7 @@ BUILD_REQUIRES="
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Test$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libswscale$secondaryArchSuffix
devel:libswscale$secondaryArchSuffix >= 6.7.100
devel:libtesseract$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
@@ -272,7 +268,7 @@ BUILD_PREREQUIRES="
# cmd:ant
cmd:cmake
cmd:doxygen
numpy${secondaryArchSuffix}_python39
numpy${secondaryArchSuffix}_python310
cmd:gcc$secondaryArchSuffix
# cmd:javac
# cmd:jni
@@ -287,7 +283,6 @@ defineDebugInfoPackage opencv$secondaryArchSuffix \
$libDir/libopencv_alphamat.so.$libVersion \
$libDir/libopencv_aruco.so.$libVersion \
$libDir/libopencv_bgsegm.so.$libVersion \
$libDir/libopencv_barcode.so.$libVersion \
$libDir/libopencv_bioinspired.so.$libVersion \
$libDir/libopencv_calib3d.so.$libVersion \
$libDir/libopencv_ccalib.so.$libVersion \
@@ -350,7 +345,7 @@ BUILD()
ARCH_SUBDIR="$secondaryArchSuffix/"
fi
pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3)
pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c4)
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
@@ -390,7 +385,6 @@ INSTALL()
prepareInstalledDevelLibs libopencv_alphamat \
libopencv_aruco \
libopencv_barcode \
libopencv_bgsegm \
libopencv_bioinspired \
libopencv_calib3d \

File diff suppressed because it is too large Load Diff