[arch-commits] Commit in opencv/repos (4 files)

Felix Yan felixonmars at archlinux.org
Tue May 18 07:49:23 UTC 2021


    Date: Tuesday, May 18, 2021 @ 07:49:23
  Author: felixonmars
Revision: 415654

archrelease: copy trunk to staging-x86_64

Added:
  opencv/repos/staging-x86_64/
  opencv/repos/staging-x86_64/PKGBUILD
    (from rev 415653, opencv/trunk/PKGBUILD)
  opencv/repos/staging-x86_64/opencv-lapack-3.9.1.patch
    (from rev 415653, opencv/trunk/opencv-lapack-3.9.1.patch)
  opencv/repos/staging-x86_64/opencv-openexr3.patch
    (from rev 415653, opencv/trunk/opencv-openexr3.patch)

---------------------------+
 PKGBUILD                  |  107 ++++++++++++++++++++++++++++++++++++++++++++
 opencv-lapack-3.9.1.patch |   40 ++++++++++++++++
 opencv-openexr3.patch     |   31 ++++++++++++
 3 files changed, 178 insertions(+)

Copied: opencv/repos/staging-x86_64/PKGBUILD (from rev 415653, opencv/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2021-05-18 07:49:23 UTC (rev 415654)
@@ -0,0 +1,107 @@
+# 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)
+pkgver=4.5.2
+pkgrel=4
+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)
+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.9.1.patch
+        opencv-openexr3.patch)
+sha256sums=('ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8'
+            '9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a'
+            '5233d9b4b8e3f4600e3f4ebef2b0ad5621faf25efbdfee96ee720a83cc81d0cc'
+            'dcddc1dd30139ac3ace668e0d530798c5691dfd2ad1e5e717db6010d659229ba')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.9.1.patch # Fix build with LAPACK 3.9.1
+  patch -d $pkgname-$pkgver -p1 < opencv-openexr3.patch # Fix build with OpenEXR 3
+}
+
+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
+  _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
+  cmake -B build -S $pkgname-$pkgver \
+    -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 \
+    -DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \
+    -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 --build build
+}
+
+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=$pkgver")
+  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)
+  unset optdepends
+
+  DESTDIR="$pkgdir" cmake --install build/modules/python3
+
+  # install license file
+  install -Dm644 $pkgbase-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+}

Copied: opencv/repos/staging-x86_64/opencv-lapack-3.9.1.patch (from rev 415653, opencv/trunk/opencv-lapack-3.9.1.patch)
===================================================================
--- staging-x86_64/opencv-lapack-3.9.1.patch	                        (rev 0)
+++ staging-x86_64/opencv-lapack-3.9.1.patch	2021-05-18 07:49:23 UTC (rev 415654)
@@ -0,0 +1,40 @@
+diff --git a/modules/core/src/hal_internal.cpp b/modules/core/src/hal_internal.cpp
+index 483281d1f7..6db47f22d8 100644
+--- a/modules/core/src/hal_internal.cpp
++++ b/modules/core/src/hal_internal.cpp
+@@ -290,7 +290,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
+             if (typeid(fptype) == typeid(float))
+                 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);
+@@ -299,7 +299,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
+             if (typeid(fptype) == typeid(float))
+                 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
+         {
+@@ -311,7 +311,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
+             if (typeid(fptype) == typeid(float))
+                 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);
+@@ -320,7 +320,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste
+             if (typeid(fptype) == typeid(float))
+                 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/staging-x86_64/opencv-openexr3.patch (from rev 415653, opencv/trunk/opencv-openexr3.patch)
===================================================================
--- staging-x86_64/opencv-openexr3.patch	                        (rev 0)
+++ staging-x86_64/opencv-openexr3.patch	2021-05-18 07:49:23 UTC (rev 415654)
@@ -0,0 +1,31 @@
+diff --git a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake
+index ef633e853a..133468243a 100644
+--- a/cmake/OpenCVFindOpenEXR.cmake
++++ b/cmake/OpenCVFindOpenEXR.cmake
+@@ -9,6 +9,14 @@
+ # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
+ #
+ 
++find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    SET(OPENEXR_FOUND TRUE)
++    SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++    SET(OPENEXR_VERSION ${OpenEXR_VERSION})
++    return()
++endif()
++
+ SET(OPENEXR_LIBRARIES "")
+ SET(OPENEXR_LIBSEARCH_SUFFIXES "")
+ file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
+diff --git a/modules/imgcodecs/src/grfmt_exr.cpp b/modules/imgcodecs/src/grfmt_exr.cpp
+index 9242871f8d..aaf28eead6 100644
+--- a/modules/imgcodecs/src/grfmt_exr.cpp
++++ b/modules/imgcodecs/src/grfmt_exr.cpp
+@@ -56,6 +56,7 @@
+ #include <iostream>
+ #include <stdexcept>
+ 
++#include <ImfFrameBuffer.h>
+ #include <ImfHeader.h>
+ #include <ImfInputFile.h>
+ #include <ImfOutputFile.h>



More information about the arch-commits mailing list