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

[Antonio Rojas]

    Date: Thursday, February 7, 2019 @ 16:42:50
  Author: arojas
Revision: 345609

Fix include dirs in pkgconfig file

Added:
  opencv/trunk/opencv-includedir.patch
Modified:
  opencv/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 ++++++++---
 opencv-includedir.patch |    9 +++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-07 15:49:18 UTC (rev 345608)
+++ PKGBUILD	2019-02-07 16:42:50 UTC (rev 345609)
@@ -4,7 +4,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -19,12 +19,17 @@
             'python-numpy: Python interface'
             '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_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
+        opencv-includedir.patch)
 sha256sums=('b79ccdc4797a959c5ab17249a8a302c066248ae070e4d7010e2d77a625fdb30a'
-            '0d8acbad4b7074cfaafd906a7419c23629179d5e98894714402090b192ef8237')
+            '0d8acbad4b7074cfaafd906a7419c23629179d5e98894714402090b192ef8237'
+            'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in pkgconfig file
 }
 
 build() {

Added: opencv-includedir.patch
===================================================================
--- opencv-includedir.patch	                        (rev 0)
+++ opencv-includedir.patch	2019-02-07 16:42:50 UTC (rev 345609)
@@ -0,0 +1,9 @@
+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}