diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2023-03-12 09:37:00 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-03-14 18:31:46 -0400 |
| commit | 177fad5528fa166688acdfaacc9a5cb096e0ad42 (patch) | |
| tree | 54226044992b11eb04a2ac52fcf46047f88c3021 | |
| parent | 03fff27cad48bec8b4310ba844787158a6f37df5 (diff) | |
[opencv]: upgrade to v4.7.0 (still FTBS)
| -rw-r--r-- | libre/opencv/PKGBUILD | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD index d66d5fb30..cb36a3070 100644 --- a/libre/opencv/PKGBUILD +++ b/libre/opencv/PKGBUILD @@ -17,7 +17,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgname=( ${pkgname[*]/opencv-cuda/} ) # non-free pkgver=4.7.0 -pkgrel=2 +pkgrel=6 _pkgver_i686=4.5.5 _pkgrel_i686=4.0 [[ "${CARCH}" == i686 ]] && eval "pkgver=\$_pkgver_${CARCH}" # our different arches do not @@ -30,7 +30,8 @@ arch+=(armv7h i686) license=(BSD3) url='https://opencv.org/' depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 openjpeg2 ffmpeg protobuf) -makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment pugixml openmpi cudnn fmt) +makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment + pugixml openmpi cudnn fmt nlohmann-json) makedepends=( ${makedepends[*]/cudnn/} ) # non-free makedepends+=( openblas ) # undefined reference to `cblas_{c,d,s,z}gemm' # makedepends+=( openblas-lapack ) # undefined reference to `cblas_{c,d,s,z}gemm' @@ -50,7 +51,7 @@ sha256sums=('8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973' '42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584' 'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e') mksha256sums=(${sha256sums[*]}) -sha256sums=('6e4b340fd60328e304065bd57d7cc4c41e954d8d4ef3a18b090ef5e898240512' +sha256sums=('00ee9f3fa2428366cefa1d29f717136abfad38d46f2f748508a599db7e57894e' SKIP) validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger @@ -58,7 +59,7 @@ validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger mksource() { ## opencv ## - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}"/$pkgname-$pkgver # remove lena.png and lena.jpg images rm -v $(find . -iname '*lena*') @@ -73,6 +74,13 @@ mksource() { # remove CUDA modules rm -rv modules/cuda* + + + ## upstream prepare() ## + + cd "${srcdir}"/ +# prepare() { + patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends } build() { @@ -90,7 +98,6 @@ build() { -DWITH_TBB=ON \ -DWITH_VULKAN=ON \ -DWITH_QT=ON \ - -DBUILD_WITH_DEBUG_INFO=OFF \ -DBUILD_TESTS=OFF \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_EXAMPLES=ON \ @@ -115,7 +122,8 @@ build() { _opts="${_opts/-DOPENCV_ENABLE_NONFREE=ON/-DOPENCV_ENABLE_NONFREE=OFF}" # non-free _opts+=" -DCMAKE_EXE_LINKER_FLAGS=-lcblas" # undefined reference to `cblas_sgemm' - cmake -B build -S $pkgname-$pkgver $_opts + cmake -B build -S $pkgname-$pkgver $_opts \ + -DBUILD_WITH_DEBUG_INFO=ON cmake --build build # 'build-cuda' recipe deleted (non-free) |