From c29fef2de50e8e2ed41e0d1bbadd057410f292cb Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Fri, 21 Jun 2019 15:40:28 +0300
Subject: [PATCH] gmic: Update to 2.6.6. Still crash for 32 bit

---
 .../0001-gmic-2.6.4-windows-build.patch       | 22 ++++++--
 mingw-w64-gmic/PKGBUILD                       | 50 +++++++++++++++----
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/mingw-w64-gmic/0001-gmic-2.6.4-windows-build.patch b/mingw-w64-gmic/0001-gmic-2.6.4-windows-build.patch
index 19fddb422e..d8982cf14a 100644
--- a/mingw-w64-gmic/0001-gmic-2.6.4-windows-build.patch
+++ b/mingw-w64-gmic/0001-gmic-2.6.4-windows-build.patch
@@ -4,14 +4,15 @@ Date: Wed, 12 Jun 2019 11:38:44 -0300
 Subject: [PATCH] patch makefile for msys2
 
 ---
- Makefile | 26 +++++++++++++++++++++-----
- 1 file changed, 21 insertions(+), 5 deletions(-)
+ CMakeLists.txt |  2 +-
+ src/Makefile   | 26 +++++++++++++++++++++-----
+ 2 file changed, 22 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 547cd70..e118b54 100644
---- a/Makefile
-+++ b/Makefile
-@@ -113,10 + 113,15 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -113,10 +113,15 @@
  OS = Unix
  endif
  
@@ -95,3 +96,14 @@ index 547cd70..e118b54 100644
 -- 
 2.21.0
 
+--- gmic-2.6.6/CMakeLists.txt.orig	2019-06-21 15:19:00.697414100 +0300
++++ gmic-2.6.6/CMakeLists.txt	2019-06-21 15:19:11.752429600 +0300
+@@ -174,7 +174,7 @@
+ endif()
+ 
+ if(ENABLE_OPENCV)
+-  pkg_check_modules(OPENCV opencv)
++  pkg_check_modules(OPENCV opencv4)
+ endif()
+ if(OPENCV_FOUND)
+   set(CLI_COMPILE_FLAGS "${CLI_COMPILE_FLAGS} -Dcimg_use_opencv")
diff --git a/mingw-w64-gmic/PKGBUILD b/mingw-w64-gmic/PKGBUILD
index 450448dee9..57c757d2d9 100644
--- a/mingw-w64-gmic/PKGBUILD
+++ b/mingw-w64-gmic/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=gmic
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.6.4
+pkgver=2.6.6
 pkgrel=1
 pkgdesc="A Full-Featured Open-Source Framework for Image Processing (mingw-w64)"
 arch=(any)
@@ -11,8 +11,9 @@ url="https://gmic.eu"
 license=("CeCILL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-gobject-introspection")
+             "${MINGW_PACKAGE_PREFIX}-cmake")
 depends=("${MINGW_PACKAGE_PREFIX}-fftw"
+         "${MINGW_PACKAGE_PREFIX}-graphicsmagick"
          "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-libjpeg"
          "${MINGW_PACKAGE_PREFIX}-libtiff"
@@ -21,22 +22,53 @@ depends=("${MINGW_PACKAGE_PREFIX}-fftw"
          "${MINGW_PACKAGE_PREFIX}-opencv")
 source=("${_realname}-${pkgver}.tar.gz::https://gmic.eu/files/source/${_realname}_${pkgver}.tar.gz"
         "0001-gmic-2.6.4-windows-build.patch")
-sha256sums=('4cd88b2dca6b9b1a330ab4556d36656bafb98e4e9814bf0448545b27ef18dae3'
-            '3f18aa5a20471e441c083c28de8afc6122d4c89aa86dd7391299efadc10b3420')
+sha256sums=('86c14da90daa0b3c09265b7b07976bf3f3a76f5b0786fecfd9fc3d9332ce0da0'
+            'd6342b0722adb46f83b9d87461973c5b42067abf5318de11da187277b022bc53')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}/src"
+  cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i "${srcdir}/0001-gmic-2.6.4-windows-build.patch"
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}/src"
-  make USR=${MINGW_PREFIX} cli lib
+  rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MINGW_CHOST}
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  ${MINGW_PREFIX}/bin/cmake \
+    -G "MSYS Makefiles" \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DCMAKE_BUILD_TYPE=RELEASE \
+    -DBUILD_LIB=ON \
+    -DBUILD_LIB_STATIC=OFF \
+    -DBUILD_PLUGIN=OFF \
+    -DBUILD_BASH_COMPLETION=OFF \
+    -DENABLE_FFMPEG=ON \
+    -DENABLE_FFTW=ON \
+    -DENABLE_GRAPHICSMAGICK=ON \
+    -DENABLE_JPEG=ON \
+    -DENABLE_OPENCV=ON \
+    -DENABLE_OPENEXR=ON \
+    -DENABLE_OPENMP=ON \
+    -DENABLE_PNG=ON \
+    -DENABLE_TIFF=ON \
+    -DENABLE_ZLIB=ON \
+    -DENABLE_DYNAMIC_LINKING=ON \
+    ../${_realname}-${pkgver}
+
+  make
+
+  #cd "${srcdir}/${_realname}-${pkgver}/src"
+  #make USR=${MINGW_PREFIX} cli lib
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}/src"
-  make -j1  USR=${MINGW_PREFIX} DESTDIR="${pkgdir}" install
+  cd build-${MINGW_CHOST}
+  make DESTDIR="${pkgdir}" install
+
+  #cd "${srcdir}/${_realname}-${pkgver}/src"
+  #make -j1  USR=${MINGW_PREFIX} DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }