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

[Antonio Rojas]

    Date: Friday, March 15, 2019 @ 15:56:23
  Author: arojas
Revision: 441917

Update to 2.5.1

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

--------------------+
 PKGBUILD           |    8 ++++----
 gmic-opencv4.patch |   12 +++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-15 15:50:55 UTC (rev 441916)
+++ PKGBUILD	2019-03-15 15:56:23 UTC (rev 441917)
@@ -6,15 +6,15 @@
 
 pkgbase=gmic
 pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
-pkgver=2.4.5
+pkgver=2.5.1
 pkgrel=1
 arch=(x86_64)
 url="https://gmic.eu/"
 license=(custom:CeCILL)
-makedepends=(gimp qt5-base fftw openexr opencv git)
+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=('e87efa20abdedf5e0000c490669d76c8a8d16a9fafa27bc9e31b79b5cbc3277f'
-            '1ffb4f8952be152ba2956a50ff6c39b078e547a4d3386cc2f34549124aefbed3'
+sha256sums=('ec36d5d43ba2be8ead7a39205f45614ff1a2e580c9df5109d54991f5c3e867f2'
+            'c7ee3be4fb2ac4243537fd8344a5bbe46ebafa0cd66a6e5cb941bbdf718378ec'
             '182c6723708302a8cee92bfb45a40ff09b8903c649ce856d0d8cd10aab0ee39b')
 
 prepare() {

Modified: gmic-opencv4.patch
===================================================================
--- gmic-opencv4.patch	2019-03-15 15:50:55 UTC (rev 441916)
+++ gmic-opencv4.patch	2019-03-15 15:56:23 UTC (rev 441917)
@@ -2,13 +2,11 @@
 index af63bcb..c7757fc 100644
 --- a/CImg.h
 +++ b/CImg.h
-@@ -414,8 +414,7 @@
- #define _cimg_redefine_False
+@@ -417,6 +417,7 @@
  #endif
  #include <cstddef>
--#include "cv.h"
--#include "highgui.h"
+ #include <opencv2/opencv.hpp>
 +#include <opencv2/videoio/videoio_c.h>
- #endif
- 
- // Configure LibPNG support.
+ #if CV_MAJOR_VERSION >=3
+ #define _cimg_fourcc cv::VideoWriter::fourcc
+ #else