extra/opencv to 4.11.0-1

This commit is contained in:
Kevin Mihelich 2025-01-08 23:49:04 +00:00
parent 4dd5f539d6
commit 5df4fd4ffb
3 changed files with 13 additions and 21 deletions

View file

@ -1,7 +1,7 @@
pkgbase = opencv
pkgdesc = Open Source Computer Vision Library
pkgver = 4.10.0
pkgrel = 18
pkgver = 4.11.0
pkgrel = 1
url = https://opencv.org/
arch = x86_64
license = Apache-2.0
@ -57,11 +57,11 @@ pkgbase = opencv
optdepends = opencl-icd-loader: For coding with OpenCL
optdepends = java-runtime: Java interface
options = !lto
source = git+https://github.com/opencv/opencv#tag=4.10.0
source = git+https://github.com/opencv/opencv_contrib#tag=4.10.0
source = git+https://github.com/opencv/opencv#tag=4.11.0
source = git+https://github.com/opencv/opencv_contrib#tag=4.11.0
source = vtk9.patch
sha256sums = 9bddee7c78e27fc8a5f5d76e5ac4ea355e7a4e5eff05bbbf97229bc088513be6
sha256sums = 24f040b420d63566aeb77191706ff08b446698adf13a715d1f3cc6b60d5c7c5b
sha256sums = 92142ded037fd61afc092ccd29a39bf1fa38bfd8e96c78e1c0abbfe60d2ddb08
sha256sums = 8b6f8ea7dfcf5ae4cc95bb4fb68e25cbe912fc28bf681552ddd13d7afee5d5d9
sha256sums = f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e
pkgname = opencv
@ -110,7 +110,7 @@ pkgname = opencv-cuda
depends = tbb
depends = zlib
depends = cudnn
provides = opencv=4.10.0
provides = opencv=4.11.0
conflicts = opencv
options = !debug
@ -126,5 +126,5 @@ pkgname = python-opencv-cuda
depends = python-numpy
depends = qt6-base
depends = vtk
provides = python-opencv=4.10.0
provides = python-opencv=4.11.0
conflicts = python-opencv

View file

@ -2,3 +2,4 @@
source = 'github'
github = 'opencv/opencv'
use_max_tag = true
exclude_regex = '.*(alpha|beta|rc).*'

View file

@ -12,8 +12,8 @@ pkgbase=opencv
pkgname=(opencv
opencv-samples
python-opencv)
pkgver=4.10.0
pkgrel=18
pkgver=4.11.0
pkgrel=1
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(Apache-2.0)
@ -69,26 +69,17 @@ optdepends=('opencv-samples: samples'
source=(git+https://github.com/opencv/opencv#tag=$pkgver
git+https://github.com/opencv/opencv_contrib#tag=$pkgver
vtk9.patch)
sha256sums=('9bddee7c78e27fc8a5f5d76e5ac4ea355e7a4e5eff05bbbf97229bc088513be6'
'24f040b420d63566aeb77191706ff08b446698adf13a715d1f3cc6b60d5c7c5b'
sha256sums=('92142ded037fd61afc092ccd29a39bf1fa38bfd8e96c78e1c0abbfe60d2ddb08'
'8b6f8ea7dfcf5ae4cc95bb4fb68e25cbe912fc28bf681552ddd13d7afee5d5d9'
'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
options=(!lto) # https://gitlab.archlinux.org/archlinux/packaging/packages/kdenlive/-/issues/8
prepare() {
pushd opencv
patch -p1 < ../vtk9.patch # Don't require all vtk optdepends
# fix build with cudnn 9
git cherry-pick -n 05e48605a0aea00d3a89b9ab5e25cdf89568aa28
# fix build with CUDA 12.4
git cherry-pick -n 1668203a1c6474b8368e27c55abc10ae7f17c841
popd
pushd opencv_contrib
# fix build with CUDA 12.4
git cherry-pick -n 4e766a039eda04b75f28f6905e4192d99b7874c7
git cherry-pick -n 1ed3dd2c53888e3289afdb22ec4e9ebbff3dba87
git cherry-pick -n 8c16a489a1fa9e2ccf21ce8eeb7fbb1affe548b1
}
build() {