[opencv]: upgrade to v4.5.1

2 files changed, 49 insertions, 50 deletions

diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index 35bebad6c..78d4f2d37 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -1,21 +1,26 @@
-# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
-# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
-# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Maintainer (arch): Ray Rashif <schiv@archlinux.org>
+# Contributor (arch): Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: grizzlyuser <grizzlyuser@protonmail.com>
 
+
+# parabola changes and rationale:
+# - remove non-free/patent-encumbered algorithms and graphics
+
+
 pkgbase=opencv
-pkgname=opencv
-pkgver=4.3.0
-pkgrel=4
-pkgrel+=.par1
-pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images"
+pkgname=(opencv opencv-samples)
+pkgver=4.5.1
+pkgrel=1
+pkgrel+=.parabola1
+pkgdesc="Free Computer Vision Library, without non-free SIFT and SURF algorithms, Milky icons, and lena images"
 arch=(x86_64)
-arch+=(i686  armv7h)
+arch+=(armv7h i686)
 license=(BSD3)
 url="https://opencv.org/"
-depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 jasper ffmpeg)
+depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 openjpeg2 ffmpeg)
 depends+=(hicolor-icon-theme)
 makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment)
 optdepends=('opencv-samples: samples'
@@ -28,18 +33,17 @@ optdepends=('opencv-samples: samples'
 mksource=("$pkgbase-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip"
           "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
           libre.patch)
-source=("https://repo.parabola.nu/other/$pkgname-libre/$pkgname-libre-$pkgver.zip"
-        opencv-includedir.patch)
-mksha256sums=('36799186756c1e12adde97f0a8d1afc395d5b0f86d8ad9ef951bc33aa732f9b9'
-              'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10'
+source=("https://repo.parabola.nu/other/$pkgname-libre/$pkgname-libre-$pkgver.tar.gz")
+mksha256sums=('5fbc26ee09e148a4d494b225d04217f7c913ca1a4d46115b70cca3565d7bbe05'
+              '12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5'
               '15139ab05b9713be6a7ee35b610f42668ea331a67c914b84a5696abd50076c54')
-sha256sums=('f82739ce08f52a3bb439c427a189da2aaa4b99ffd2d07fd6b26194b64e876900'
-            'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
+sha256sums=('ceaf168d694e8044e2c705c47537410d8c9871b5665edd82d9792b1233e575a1')
+
 
 mksource() {
   cd "$srcdir/opencv_contrib-$pkgver"
 
-  # remove nonfree SIFT and SURF algorithms that are patented in some countries and have some other limitations on the use
+  # remove SIFT and SURF algorithms
   rm -rv modules/xfeatures2d
 
   cd "$srcdir/$pkgname-$pkgver"
@@ -52,29 +56,20 @@ mksource() {
   rm -v $(find . -iname '*lena*')
 }
 
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in pkgconfig file
-
-  sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # Don't use TBB's cmake config, it breaks build
-}
-
 build() {
-  cd build
-  export JAVA_HOME="/usr/lib/jvm/default"
   # SSE only available from Pentium 3 onwards (i686 is way older)
   # SSE only available x86 hardware and ARM uses NEON
+  local _per_arch_options
   case "$CARCH" in
-    i686) extra='-DCPU_BASELINE_DISABLE=SSE,SSE2' ;;
-    x86_64) extra='-DCPU_BASELINE_DISABLE=SSE3 -DCPU_BASELINE_REQUIRE=SSE2' ;;
-    *) extra='' ;;
+    i686) _per_arch_options='-DCPU_BASELINE_DISABLE=SSE,SSE2' ;;
+    x86_64) _per_arch_options='-DCPU_BASELINE_DISABLE=SSE3 -DCPU_BASELINE_REQUIRE=SSE2' ;;
+    *) _per_arch_options='' ;;
   esac
 
+  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 ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DWITH_OPENCL=ON \
     -DWITH_OPENGL=ON \
     -DWITH_TBB=ON \
@@ -87,7 +82,7 @@ build() {
     -DINSTALL_C_EXAMPLES=ON \
     -DINSTALL_PYTHON_EXAMPLES=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    $extra \
+    ${_per_arch_options} \
     -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
     -DOPENCV_SKIP_PYTHON_LOADER=ON \
     -DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \
@@ -99,18 +94,31 @@ build() {
     -DOPENCV_JNI_INSTALL_PATH=lib \
     -DOPENCV_GENERATE_SETUPVARS=OFF \
     -DEIGEN_INCLUDE_PATH=/usr/include/eigen3
-#    -DWITH_IPP=OFF
-  make
+  cmake --build build
 }
 
 package_opencv() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
   # install license file
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 $pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 
   # separate samples package
-  cd "$pkgdir"/usr/share
-  rm -r opencv4/samples
+  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
+}
+
+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 opencv-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 }
diff --git a/libre/opencv/opencv-includedir.patch b/libre/opencv/opencv-includedir.patch
deleted file mode 100644
index dd5309467..000000000
--- a/libre/opencv/opencv-includedir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -u -r opencv-4.0.1/cmake/templates/opencv-XXX.pc.in opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in
---- opencv-4.0.1/cmake/templates/opencv-XXX.pc.in	2018-12-22 07:03:30.000000000 +0000
-+++ opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in	2019-02-07 15:08:15.016613349 +0000
-@@ -11,4 +10,4 @@
- Version: @OPENCV_VERSION_PLAIN@
- Libs: @OPENCV_PC_LIBS@
- Libs.private: @OPENCV_PC_LIBS_PRIVATE@
--Cflags: -I${includedir_old} -I${includedir_new}
-+Cflags: -I${includedir_new}