[arch-commits] Commit in opencv/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Friday, February 28, 2020 @ 11:17:07
  Author: arojas
Revision: 376382

Install all CMake files required to build samples (FS#63742)

Modified:
  opencv/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-28 10:40:52 UTC (rev 376381)
+++ PKGBUILD	2020-02-28 11:17:07 UTC (rev 376382)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -20,10 +20,12 @@
             'java-runtime: Java interface')
 source=("$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"
-        opencv-includedir.patch)
+        opencv-includedir.patch
+        opencv-install-samples_utils.patch::"https://github.com/opencv/opencv/commit/981e63d8.patch")
 sha256sums=('55bd939079d141a50fca74bde5b61b339dd0f0ece6320ec76859aaff03c90d9f'
             '8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020'
-            'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
+            'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10'
+            'c370f234931d46cd01234d48a01af02642d7e90a0486278fa7845d3bac1c514a')
 
 prepare() {
   mkdir -p build
@@ -30,6 +32,7 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in pkgconfig file
+  patch -p1 -i ../opencv-install-samples_utils.patch # Install all CMake files required to build samples
 
   sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # Don't use TBB's cmake config, it breaks build
 }
@@ -75,8 +78,7 @@
   install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 
   # separate samples package
-  cd "$pkgdir"/usr/share
-  mv opencv4/samples "$srcdir"/$pkgname-samples
+  mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
 }
 
 package_opencv-samples() {
@@ -84,10 +86,9 @@
   depends=("opencv=$pkgver")
   unset optdepends
 
-  mkdir -p "$pkgdir"/usr/share/opencv
-  cp -r "$srcdir"/opencv-samples "$pkgdir"/usr/share/opencv/samples
-  # fix permissions
-  chmod 755 "$pkgdir"/usr/share/opencv/samples/*
+  cd build
+  mkdir -p "$pkgdir"/usr/share/opencv4
+  mv "$srcdir"/samples "$pkgdir"/usr/share/opencv4
 
   # install license file
   install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname