community/gmic to 2.9.0-1

community/gmic/PKGBUILD

@@ -12,26 +12,18 @@ highmem=1
 
 pkgbase=gmic
 pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
-pkgver=2.8.4
-pkgrel=2
+pkgver=2.9.0
+pkgrel=1
 arch=(x86_64)
 url="https://gmic.eu/"
 license=(custom:CeCILL)
 makedepends=(gimp qt5-base fftw openexr opencv eigen git)
-source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch
-        git+https://github.com/c-koi/zart#commit=2d8727b5)
-sha256sums=('94d2cb6bf68c7d3a44817402bdd412b331f8434500de0a99dabf89d147576412'
-            'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296'
-            'SKIP')
+source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch)
+sha256sums=('6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5'
+            'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296')
 
 prepare() {
-# Use git version of zart which builds with current gmic
-  rm -r gmic-$pkgver/zart
-  mv zart gmic-$pkgver
-
   sed -e 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' -i gmic-$pkgver/src/Makefile
-# Fix segfault on zart due to optimization https://github.com/c-koi/zart/issues/14
-  sed -e 's|-Ofast||g' -e 's|-flto||g' -i gmic-$pkgver/src/Makefile -i gmic-$pkgver/gmic-qt/gmic_qt.pro
 # fix overlinking
   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 
@@ -46,9 +38,6 @@ prepare() {
 }
 
 build() {
-  #unset CFLAGS
-  CFLAGS=`echo $CFLAGS | sed -e 's/-O2//'` && CXXFLAGS="$CFLAGS"
-
   cd gmic-$pkgver
   make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} -j1
 
@@ -61,6 +50,7 @@ build() {
   make  
 
   cd ../zart
+  export CFLAGS=${CFLAGS/-O2/} # https://github.com/c-koi/zart/issues/14
   qmake GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on QMAKE_CXXFLAGS+=" -DOPENCV2_HEADERS"
   make
 }