[arch-commits] Commit in opencv/repos/extra-x86_64 (6 files)

Antonio Rojas arojas at gemini.archlinux.org
Tue Nov 9 21:00:04 UTC 2021


    Date: Tuesday, November 9, 2021 @ 21:00:03
  Author: arojas
Revision: 427788

archrelease: copy trunk to extra-x86_64

Added:
  opencv/repos/extra-x86_64/PKGBUILD
    (from rev 427787, opencv/trunk/PKGBUILD)
  opencv/repos/extra-x86_64/opencv-lapack-3.10.patch
    (from rev 427787, opencv/trunk/opencv-lapack-3.10.patch)
  opencv/repos/extra-x86_64/vtk9.patch
    (from rev 427787, opencv/trunk/vtk9.patch)
Deleted:
  opencv/repos/extra-x86_64/PKGBUILD
  opencv/repos/extra-x86_64/opencv-lapack-3.10.patch
  opencv/repos/extra-x86_64/vtk9.patch

--------------------------+
 PKGBUILD                 |  274 ++++++++++++++++++++++-----------------------
 opencv-lapack-3.10.patch |  216 +++++++++++++++++------------------
 vtk9.patch               |   72 +++++------
 3 files changed, 282 insertions(+), 280 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-09 20:59:50 UTC (rev 427787)
+++ PKGBUILD	2021-11-09 21:00:03 UTC (rev 427788)
@@ -1,136 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase=opencv
-pkgname=(opencv opencv-samples python-opencv opencv-cuda)
-pkgver=4.5.4
-pkgrel=5
-pkgdesc='Open Source Computer Vision Library'
-arch=(x86_64)
-license=(BSD)
-url='https://opencv.org/'
-depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 openjpeg2 ffmpeg)
-makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment pugixml openmpi cudnn)
-optdepends=('opencv-samples: samples'
-            'vtk: for the viz module'
-            'glew: for the viz module'
-            'qt5-base: for the HighGUI module'
-            'hdf5: for the HDF5 module'
-            'opencl-icd-loader: For coding with OpenCL'
-            'java-runtime: Java interface')
-source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
-        https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-        opencv-lapack-3.10.patch
-        fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch
-        vtk9.patch)
-sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
-            'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
-            'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
-            'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369'
-            'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
-
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with LAPACK 3.10
-  patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
-  patch -d opencv_contrib-$pkgver -p1 < fix-cvv-build.patch # Fix build of cvv module
-}
-
-build() {
-  export JAVA_HOME="/usr/lib/jvm/default"
-  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
-  _opts="-DWITH_OPENCL=ON \
-         -DWITH_OPENGL=ON \
-         -DWITH_TBB=ON \
-         -DWITH_VULKAN=ON \
-         -DWITH_QT=ON \
-         -DBUILD_WITH_DEBUG_INFO=OFF \
-         -DBUILD_TESTS=OFF \
-         -DBUILD_PERF_TESTS=OFF \
-         -DBUILD_EXAMPLES=ON \
-         -DINSTALL_C_EXAMPLES=ON \
-         -DINSTALL_PYTHON_EXAMPLES=ON \
-         -DCMAKE_INSTALL_PREFIX=/usr \
-         -DCPU_BASELINE_DISABLE=SSE3 \
-         -DCPU_BASELINE_REQUIRE=SSE2 \
-         -DOPENCV_EXTRA_MODULES_PATH=$srcdir/opencv_contrib-$pkgver/modules \
-         -DOPENCV_SKIP_PYTHON_LOADER=ON \
-         -DLAPACK_LIBRARIES=/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so \
-         -DLAPACK_CBLAS_H=/usr/include/cblas.h \
-         -DLAPACK_LAPACKE_H=/usr/include/lapacke.h \
-         -DOPENCV_GENERATE_PKGCONFIG=ON \
-         -DOPENCV_ENABLE_NONFREE=ON \
-         -DOPENCV_JNI_INSTALL_PATH=lib \
-         -DOPENCV_GENERATE_SETUPVARS=OFF \
-         -DEIGEN_INCLUDE_PATH=/usr/include/eigen3"
- 
-  cmake -B build -S $pkgname-$pkgver $_opts
-  cmake --build build
-
-  cmake -B build-cuda -S $pkgname-$pkgver $_opts \
-    -DWITH_CUDA=ON \
-    -DWITH_CUDNN=ON
-  cmake --build build-cuda
-}
-
-package_opencv() {
-  DESTDIR="$pkgdir" cmake --install build
-
-  # install license file
-  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-
-  # separate samples package
-  mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
-
-  # Add java symlinks expected by some binary blobs
-  ln -sr "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
-  ln -sr "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
-
-  # Split Python bindings
-  rm -r "$pkgdir"/usr/lib/python3*
-}
-
-package_opencv-samples() {
-  pkgdesc+=' (samples)'
-  depends=(opencv)
-  unset optdepends
-
-  mkdir -p "$pkgdir"/usr/share/opencv4
-  mv samples "$pkgdir"/usr/share/opencv4
-
-  # install license file
-  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-}
-
-package_python-opencv() {
-  pkgdesc='Python bindings for OpenCV'
-  depends=(python-numpy opencv vtk glew qt5-base hdf5 jsoncpp openmpi pugixml)
-  unset optdepends
-
-  DESTDIR="$pkgdir" cmake --install build/modules/python3
-
-  # install license file
-  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-}
-
-package_opencv-cuda() {
-  pkgdesc+=' (with CUDA support)'
-  depends+=(cudnn)
-  conflicts=(opencv)
-  provides=(opencv=$pkgver)
-
-  DESTDIR="$pkgdir" cmake --install build-cuda
-
-  # install license file
-  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-
-  # Split samples
-  rm -r "$pkgdir"/usr/share/opencv4/samples
-
-  # Add java symlinks expected by some binary blobs
-  ln -sr "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
-  ln -sr "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
-
-  # Split Python bindings
-  rm -r "$pkgdir"/usr/lib/python3*
-}

Copied: opencv/repos/extra-x86_64/PKGBUILD (from rev 427787, opencv/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-09 21:00:03 UTC (rev 427788)
@@ -0,0 +1,138 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase=opencv
+pkgname=(opencv opencv-samples python-opencv opencv-cuda)
+pkgver=4.5.4
+pkgrel=6
+pkgdesc='Open Source Computer Vision Library'
+arch=(x86_64)
+license=(BSD)
+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)
+optdepends=('opencv-samples: samples'
+            'vtk: for the viz module'
+            'glew: for the viz module'
+            'qt5-base: for the HighGUI module'
+            'hdf5: for the HDF5 module'
+            'opencl-icd-loader: For coding with OpenCL'
+            'java-runtime: Java interface')
+source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
+        https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
+        opencv-lapack-3.10.patch
+        fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch
+        vtk9.patch)
+sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
+            'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
+            'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
+            'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369'
+            'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with LAPACK 3.10
+  patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
+  patch -d opencv_contrib-$pkgver -p1 < fix-cvv-build.patch # Fix build of cvv module
+}
+
+build() {
+  export JAVA_HOME="/usr/lib/jvm/default"
+  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
+  _opts="-DWITH_OPENCL=ON \
+         -DWITH_OPENGL=ON \
+         -DWITH_TBB=ON \
+         -DWITH_VULKAN=ON \
+         -DWITH_QT=ON \
+         -DBUILD_WITH_DEBUG_INFO=OFF \
+         -DBUILD_TESTS=OFF \
+         -DBUILD_PERF_TESTS=OFF \
+         -DBUILD_EXAMPLES=ON \
+         -DBUILD_PROTOBUF=OFF \
+         -DPROTOBUF_UPDATE_FILES=ON \
+         -DINSTALL_C_EXAMPLES=ON \
+         -DINSTALL_PYTHON_EXAMPLES=ON \
+         -DCMAKE_INSTALL_PREFIX=/usr \
+         -DCPU_BASELINE_DISABLE=SSE3 \
+         -DCPU_BASELINE_REQUIRE=SSE2 \
+         -DOPENCV_EXTRA_MODULES_PATH=$srcdir/opencv_contrib-$pkgver/modules \
+         -DOPENCV_SKIP_PYTHON_LOADER=ON \
+         -DLAPACK_LIBRARIES=/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so \
+         -DLAPACK_CBLAS_H=/usr/include/cblas.h \
+         -DLAPACK_LAPACKE_H=/usr/include/lapacke.h \
+         -DOPENCV_GENERATE_PKGCONFIG=ON \
+         -DOPENCV_ENABLE_NONFREE=ON \
+         -DOPENCV_JNI_INSTALL_PATH=lib \
+         -DOPENCV_GENERATE_SETUPVARS=OFF \
+         -DEIGEN_INCLUDE_PATH=/usr/include/eigen3"
+ 
+  cmake -B build -S $pkgname-$pkgver $_opts
+  cmake --build build
+
+  cmake -B build-cuda -S $pkgname-$pkgver $_opts \
+    -DWITH_CUDA=ON \
+    -DWITH_CUDNN=ON
+  cmake --build build-cuda
+}
+
+package_opencv() {
+  DESTDIR="$pkgdir" cmake --install build
+
+  # install license file
+  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+
+  # separate samples package
+  mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
+
+  # Add java symlinks expected by some binary blobs
+  ln -sr "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
+  ln -sr "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
+
+  # Split Python bindings
+  rm -r "$pkgdir"/usr/lib/python3*
+}
+
+package_opencv-samples() {
+  pkgdesc+=' (samples)'
+  depends=(opencv)
+  unset optdepends
+
+  mkdir -p "$pkgdir"/usr/share/opencv4
+  mv samples "$pkgdir"/usr/share/opencv4
+
+  # install license file
+  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+}
+
+package_python-opencv() {
+  pkgdesc='Python bindings for OpenCV'
+  depends=(python-numpy opencv vtk glew qt5-base hdf5 jsoncpp openmpi pugixml)
+  unset optdepends
+
+  DESTDIR="$pkgdir" cmake --install build/modules/python3
+
+  # install license file
+  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+}
+
+package_opencv-cuda() {
+  pkgdesc+=' (with CUDA support)'
+  depends+=(cudnn)
+  conflicts=(opencv)
+  provides=(opencv=$pkgver)
+
+  DESTDIR="$pkgdir" cmake --install build-cuda
+
+  # install license file
+  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+
+  # Split samples
+  rm -r "$pkgdir"/usr/share/opencv4/samples
+
+  # Add java symlinks expected by some binary blobs
+  ln -sr "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
+  ln -sr "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
+
+  # Split Python bindings
+  rm -r "$pkgdir"/usr/lib/python3*
+}

Deleted: opencv-lapack-3.10.patch
===================================================================
--- opencv-lapack-3.10.patch	2021-11-09 20:59:50 UTC (rev 427787)
+++ opencv-lapack-3.10.patch	2021-11-09 21:00:03 UTC (rev 427788)
@@ -1,108 +0,0 @@
-diff --git a/modules/core/src/hal_internal.cpp b/modules/core/src/hal_internal.cpp
-index 483281d1f7..05239e98f4 100644
---- a/modules/core/src/hal_internal.cpp
-+++ b/modules/core/src/hal_internal.cpp
-@@ -163,9 +163,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
-         if(n == 1 && b_step == sizeof(fptype))
-         {
-             if(typeid(fptype) == typeid(float))
--                sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
-+                LAPACK_sposv(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
-             else if(typeid(fptype) == typeid(double))
--                dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
-+                LAPACK_dposv(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
-         }
-         else
-         {
-@@ -174,9 +174,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
-             transpose(b, ldb, tmpB, m, m, n);
- 
-             if(typeid(fptype) == typeid(float))
--                sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
-+                LAPACK_sposv(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
-             else if(typeid(fptype) == typeid(double))
--                dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
-+                LAPACK_dposv(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
- 
-             transpose(tmpB, m, b, ldb, n, m);
-             delete[] tmpB;
-@@ -185,9 +185,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
-     else
-     {
-         if(typeid(fptype) == typeid(float))
--            spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
-+            LAPACK_spotrf(L, &m, (float*)a, &lda, &lapackStatus);
-         else if(typeid(fptype) == typeid(double))
--            dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
-+            LAPACK_dpotrf(L, &m, (double*)a, &lda, &lapackStatus);
-     }
- 
-     if(lapackStatus == 0) *info = true;
-@@ -227,17 +227,17 @@ lapack_SVD(fptype* a, size_t a_step, fptype *w, fptype* u, size_t u_step, fptype
-     }
- 
-     if(typeid(fptype) == typeid(float))
--        sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
-+        LAPACK_sgesdd(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
-     else if(typeid(fptype) == typeid(double))
--        dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
-+        LAPACK_dgesdd(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
- 
-     lwork = (int)round(work1); //optimal buffer size
-     fptype* buffer = new fptype[lwork + 1];
- 
-     if(typeid(fptype) == typeid(float))
--        sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
-+        LAPACK_sgesdd(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
-     else if(typeid(fptype) == typeid(double))
--        dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
-+        LAPACK_dgesdd(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
- 
-     if(!(flags & CV_HAL_SVD_NO_UV))
-         transpose_square_inplace(vt, ldv, n);
-@@ -288,18 +288,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
-         if (k == 1 && b_step == sizeof(fptype))
-         {
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
-+                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
-+                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
- 
-             lwork = cvRound(work1); //optimal buffer size
-             std::vector<fptype> workBufMemHolder(lwork + 1);
-             fptype* buffer = &workBufMemHolder.front();
- 
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
-+                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
-+                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
-         }
-         else
-         {
-@@ -309,18 +309,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
-             transpose(b, ldb, tmpB, m, m, k);
- 
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
-+                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
-+                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
- 
-             lwork = cvRound(work1); //optimal buffer size
-             std::vector<fptype> workBufMemHolder(lwork + 1);
-             fptype* buffer = &workBufMemHolder.front();
- 
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
-+                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
-+                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
- 
-             transpose(tmpB, m, b, ldb, k, m);
-         }

Copied: opencv/repos/extra-x86_64/opencv-lapack-3.10.patch (from rev 427787, opencv/trunk/opencv-lapack-3.10.patch)
===================================================================
--- opencv-lapack-3.10.patch	                        (rev 0)
+++ opencv-lapack-3.10.patch	2021-11-09 21:00:03 UTC (rev 427788)
@@ -0,0 +1,108 @@
+diff --git a/modules/core/src/hal_internal.cpp b/modules/core/src/hal_internal.cpp
+index 483281d1f7..05239e98f4 100644
+--- a/modules/core/src/hal_internal.cpp
++++ b/modules/core/src/hal_internal.cpp
+@@ -163,9 +163,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
+         if(n == 1 && b_step == sizeof(fptype))
+         {
+             if(typeid(fptype) == typeid(float))
+-                sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
++                LAPACK_sposv(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
+             else if(typeid(fptype) == typeid(double))
+-                dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
++                LAPACK_dposv(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
+         }
+         else
+         {
+@@ -174,9 +174,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
+             transpose(b, ldb, tmpB, m, m, n);
+ 
+             if(typeid(fptype) == typeid(float))
+-                sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
++                LAPACK_sposv(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
+             else if(typeid(fptype) == typeid(double))
+-                dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
++                LAPACK_dposv(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
+ 
+             transpose(tmpB, m, b, ldb, n, m);
+             delete[] tmpB;
+@@ -185,9 +185,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n
+     else
+     {
+         if(typeid(fptype) == typeid(float))
+-            spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
++            LAPACK_spotrf(L, &m, (float*)a, &lda, &lapackStatus);
+         else if(typeid(fptype) == typeid(double))
+-            dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
++            LAPACK_dpotrf(L, &m, (double*)a, &lda, &lapackStatus);
+     }
+ 
+     if(lapackStatus == 0) *info = true;
+@@ -227,17 +227,17 @@ lapack_SVD(fptype* a, size_t a_step, fptype *w, fptype* u, size_t u_step, fptype
+     }
+ 
+     if(typeid(fptype) == typeid(float))
+-        sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
++        LAPACK_sgesdd(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
+     else if(typeid(fptype) == typeid(double))
+-        dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
++        LAPACK_dgesdd(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
+ 
+     lwork = (int)round(work1); //optimal buffer size
+     fptype* buffer = new fptype[lwork + 1];
+ 
+     if(typeid(fptype) == typeid(float))
+-        sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
++        LAPACK_sgesdd(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
+     else if(typeid(fptype) == typeid(double))
+-        dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
++        LAPACK_dgesdd(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
+ 
+     if(!(flags & CV_HAL_SVD_NO_UV))
+         transpose_square_inplace(vt, ldv, n);
+@@ -288,18 +288,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
+         if (k == 1 && b_step == sizeof(fptype))
+         {
+             if (typeid(fptype) == typeid(float))
+-                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
++                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
+             else if (typeid(fptype) == typeid(double))
+-                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
++                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
+ 
+             lwork = cvRound(work1); //optimal buffer size
+             std::vector<fptype> workBufMemHolder(lwork + 1);
+             fptype* buffer = &workBufMemHolder.front();
+ 
+             if (typeid(fptype) == typeid(float))
+-                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
++                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
+             else if (typeid(fptype) == typeid(double))
+-                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
++                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
+         }
+         else
+         {
+@@ -309,18 +309,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
+             transpose(b, ldb, tmpB, m, m, k);
+ 
+             if (typeid(fptype) == typeid(float))
+-                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
++                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
+             else if (typeid(fptype) == typeid(double))
+-                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
++                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
+ 
+             lwork = cvRound(work1); //optimal buffer size
+             std::vector<fptype> workBufMemHolder(lwork + 1);
+             fptype* buffer = &workBufMemHolder.front();
+ 
+             if (typeid(fptype) == typeid(float))
+-                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
++                LAPACK_sgels(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
+             else if (typeid(fptype) == typeid(double))
+-                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
++                LAPACK_dgels(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
+ 
+             transpose(tmpB, m, b, ldb, k, m);
+         }

Deleted: vtk9.patch
===================================================================
--- vtk9.patch	2021-11-09 20:59:50 UTC (rev 427787)
+++ vtk9.patch	2021-11-09 21:00:03 UTC (rev 427788)
@@ -1,36 +0,0 @@
-diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake
-index 312fd41fe4..aeda80d47c 100644
---- a/cmake/OpenCVDetectVTK.cmake
-+++ b/cmake/OpenCVDetectVTK.cmake
-@@ -1,8 +1,5 @@
- if(NOT VTK_FOUND)
--  find_package(VTK QUIET NAMES vtk VTK)
--  if(VTK_FOUND)
--    if(NOT (VTK_VERSION VERSION_LESS "9.0.0") AND (VTK_VERSION VERSION_LESS "10.0.0")) # VTK 9.x
--      find_package(VTK 9 QUIET NAMES vtk COMPONENTS
-+  find_package(VTK 9 QUIET NAMES vtk COMPONENTS
-               FiltersExtraction
-               FiltersSources
-               FiltersTexture
-@@ -14,21 +11,6 @@ if(NOT VTK_FOUND)
-               RenderingLOD
-               RenderingOpenGL2
-               NO_MODULE)
--    elseif(VTK_VERSION VERSION_GREATER "5") # VTK 6.x components
--      find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
--      IF(VTK_FOUND)
--        IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
--          find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
--        ELSE(VTK_RENDERING_BACKEND)
--          find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
--        ENDIF(VTK_RENDERING_BACKEND)
--      ENDIF(VTK_FOUND)
--    elseif(VTK_VERSION VERSION_EQUAL "5") # VTK 5.x components
--      find_package(VTK QUIET COMPONENTS vtkCommon NO_MODULE)
--    else()
--      set(VTK_FOUND FALSE)
--    endif()
--  endif()
- endif()
- 
- if(NOT VTK_FOUND)

Copied: opencv/repos/extra-x86_64/vtk9.patch (from rev 427787, opencv/trunk/vtk9.patch)
===================================================================
--- vtk9.patch	                        (rev 0)
+++ vtk9.patch	2021-11-09 21:00:03 UTC (rev 427788)
@@ -0,0 +1,36 @@
+diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake
+index 312fd41fe4..aeda80d47c 100644
+--- a/cmake/OpenCVDetectVTK.cmake
++++ b/cmake/OpenCVDetectVTK.cmake
+@@ -1,8 +1,5 @@
+ if(NOT VTK_FOUND)
+-  find_package(VTK QUIET NAMES vtk VTK)
+-  if(VTK_FOUND)
+-    if(NOT (VTK_VERSION VERSION_LESS "9.0.0") AND (VTK_VERSION VERSION_LESS "10.0.0")) # VTK 9.x
+-      find_package(VTK 9 QUIET NAMES vtk COMPONENTS
++  find_package(VTK 9 QUIET NAMES vtk COMPONENTS
+               FiltersExtraction
+               FiltersSources
+               FiltersTexture
+@@ -14,21 +11,6 @@ if(NOT VTK_FOUND)
+               RenderingLOD
+               RenderingOpenGL2
+               NO_MODULE)
+-    elseif(VTK_VERSION VERSION_GREATER "5") # VTK 6.x components
+-      find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
+-      IF(VTK_FOUND)
+-        IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
+-          find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
+-        ELSE(VTK_RENDERING_BACKEND)
+-          find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
+-        ENDIF(VTK_RENDERING_BACKEND)
+-      ENDIF(VTK_FOUND)
+-    elseif(VTK_VERSION VERSION_EQUAL "5") # VTK 5.x components
+-      find_package(VTK QUIET COMPONENTS vtkCommon NO_MODULE)
+-    else()
+-      set(VTK_FOUND FALSE)
+-    endif()
+-  endif()
+ endif()
+ 
+ if(NOT VTK_FOUND)



More information about the arch-commits mailing list