graphics/gmic: Updated for version 2.4.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 26 insertions, 23 deletions

diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild
index 1659dd2143..0184332d47 100644
--- a/graphics/gmic/gmic.SlackBuild
+++ b/graphics/gmic/gmic.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2016  Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
+# Copyright 2018 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gmic
-VERSION=${VERSION:-2.0.0}
-SRCVER=8419067dfc17963aad27303ecacc5a3b1f5c0644
+VERSION=${VERSION:-2.4.2}
+COMMUNITYVERSION=${COMMUNITYVERSION:-b43000765fee484a9156d180e891d7a0e1bf8d0b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,16 +40,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O0 -march=i586 -mtune=i686 -fno-fast-math"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O0 -march=i686 -mtune=i686 -fno-fast-math"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O0 -fPIC -fno-fast-math"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O0 -fno-fast-math"
   LIBDIRSUFFIX=""
 fi
 
@@ -60,10 +60,11 @@ mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PRGNAM
 rm -rf $PRGNAM-community
+rm -rf $PRGNAM-qt
 tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz --warning=no-unknown-keyword
 mv $PRGNAM-$VERSION $PRGNAM
-unzip $CWD/$PRGNAM-community-$SRCVER.zip || unzip $CWD/$SRCVER
-mv $PRGNAM-community-$SRCVER $PRGNAM-community
+unzip $CWD/$PRGNAM-community-$COMMUNITYVERSION.zip || unzip $CWD/$COMMUNITYVERSION
+mv $PRGNAM-community-$COMMUNITYVERSION $PRGNAM-community
 cd $PRGNAM
 chown -R root:root .
 find -L . \
@@ -72,14 +73,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cd src
-  sed -i "s/LIB = lib/LIB = lib$LIBDIRSUFFIX/" Makefile
-  sed -i "s:/share/man/:/man/:g" Makefile
-  # freshen gmic_stdlib.h to stop the Makefile downloading it
-  touch gmic_stdlib.h
-  make
-  make install DESTDIR=$PKG
-cd -
+sed -i -e "s|LIB = lib|LIB = lib$LIBDIRSUFFIX|g" \
+       -e "s|/share/man/|/man/|g" \
+       -e "s|/etc/bash_completion.d|/usr/share/bash-completion/completions|g" \
+       -e "s|qmake|qmake-qt5|g" \
+       src/Makefile
+sed -i -e "s|-Ofast|-O2 -fno-fast-math --std=c++11|g" \
+    gmic-qt/gmic_qt.pro
+
+make -C src LIB=lib$LIBDIRSUFFIX OPT_CFLAGS="$SLKCFLAGS" all WGET=/bin/true
+make -C src install LIB=lib$LIBDIRSUFFIX DESTDIR="$PKG" USR="/usr"
 
 rmdir $PKG/usr/share || true
 
diff --git a/graphics/gmic/gmic.info b/graphics/gmic/gmic.info
index d71eafdbed..a62c7ee496 100644
--- a/graphics/gmic/gmic.info
+++ b/graphics/gmic/gmic.info
@@ -1,12 +1,12 @@
 PRGNAM="gmic"
-VERSION="2.0.0"
+VERSION="2.4.2"
 HOMEPAGE="https://gmic.eu"
-DOWNLOAD="https://gmic.eu/files/source/gmic_2.0.0.tar.gz \
-          https://codeload.github.com/dtschump/gmic-community/zip/8419067dfc17963aad27303ecacc5a3b1f5c0644"
-MD5SUM="949282a7f4e2ba86deb2d893f6b108e3 \
-        c08c8c77e2132d9f2f3c8b1502d80b4c"
+DOWNLOAD="https://gmic.eu/files/source/gmic_2.4.2.tar.gz \
+          https://github.com/dtschump/gmic-community/archive/b43000765fee484a9156d180e891d7a0e1bf8d0b.zip"
+MD5SUM="a43389984672136ab04e0a170ed233b7 \
+        313abfe891858395626a0bbd7c33d786" 
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="opencv"
+REQUIRES="qt5 opencv-legacy"
 MAINTAINER="Giorgio Peron"
 EMAIL="giorgio.peron@gmail.com"