[arch-commits] Commit in gmic/trunk (PKGBUILD gmic-opencv4.patch)

[Antonio Rojas]

    Date: Monday, May 13, 2019 @ 20:43:26
  Author: arojas
Revision: 467172

Update to 2.6.2

Modified:
  gmic/trunk/PKGBUILD
Deleted:
  gmic/trunk/gmic-opencv4.patch

--------------------+
 PKGBUILD           |   13 +++++--------
 gmic-opencv4.patch |   12 ------------
 2 files changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-13 20:30:29 UTC (rev 467171)
+++ PKGBUILD	2019-05-13 20:43:26 UTC (rev 467172)
@@ -6,15 +6,14 @@
 
 pkgbase=gmic
 pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
-pkgver=2.6.1
+pkgver=2.6.2
 pkgrel=1
 arch=(x86_64)
 url="https://gmic.eu/"
 license=(custom:CeCILL)
 makedepends=(gimp qt5-base fftw openexr opencv eigen)
-source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz gmic-opencv4.patch zart-opencv4.patch)
-sha256sums=('48de7045a36eb718d55b0dfd68a797380b5390af99c9737a4dfba0fb678ed2b4'
-            'c7ee3be4fb2ac4243537fd8344a5bbe46ebafa0cd66a6e5cb941bbdf718378ec'
+source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch)
+sha256sums=('91106fb0762269ab316aeff75a65d77ed0248f5f298bd2577cd3b010528444cd'
             '182c6723708302a8cee92bfb45a40ff09b8903c649ce856d0d8cd10aab0ee39b')
 
 prepare() {
@@ -23,15 +22,13 @@
   sed -e 's/pkg-config opencv --libs ||//' -e 's/-lopencv_highgui/-lopencv_videoio/' \
       -e 's/pkg-config opencv/pkg-config opencv4/' -i gmic-$pkgver/src/Makefile 
 # fix build with openCV 4.0
-  cd gmic-$pkgver/src
-  patch -p1 -i "$srcdir"/gmic-opencv4.patch
-  cd ../zart
+  cd gmic-$pkgver/zart
   patch -p1 -i "$srcdir"/zart-opencv4.patch
 }
 
 build() {
   cd gmic-$pkgver
-  make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS}
+  make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} -j1
 
   cd gmic-qt
   qmake GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none

Deleted: gmic-opencv4.patch
===================================================================
--- gmic-opencv4.patch	2019-05-13 20:30:29 UTC (rev 467171)
+++ gmic-opencv4.patch	2019-05-13 20:43:26 UTC (rev 467172)
@@ -1,12 +0,0 @@
-diff --git a/CImg.h b/CImg.h
-index af63bcb..c7757fc 100644
---- a/CImg.h
-+++ b/CImg.h
-@@ -417,6 +417,7 @@
- #endif
- #include <cstddef>
- #include <opencv2/opencv.hpp>
-+#include <opencv2/videoio/videoio_c.h>
- #if CV_MAJOR_VERSION >=3
- #define _cimg_fourcc cv::VideoWriter::fourcc
- #else