From 6d34615574847ff354027da4644b7e46d0901436 Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Sun, 2 Jul 2017 14:16:42 -0600 Subject: [PATCH] gmic: update to 2.0.2 Closes: #6930 [via git-merge-pr] --- srcpkgs/gmic/patches/makefile.patch | 25 ++++++++++++++++++++++++ srcpkgs/gmic/template | 30 ++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/gmic/patches/makefile.patch diff --git a/srcpkgs/gmic/patches/makefile.patch b/srcpkgs/gmic/patches/makefile.patch new file mode 100644 index 0000000000..9239706690 --- /dev/null +++ b/srcpkgs/gmic/patches/makefile.patch @@ -0,0 +1,25 @@ +--- src/Makefile 2017-06-22 08:41:18.000000000 -0400 ++++ src/Makefile 2017-07-02 05:37:27.341025728 -0400 +@@ -477,14 +477,14 @@ + + gmic_qt_path: + @if [ ! -d ../gmic-qt ]; then \ +- if [ ! -d ../../gmic-qt ]; then \ ++ if [ ! -d ../gmic-qt ]; then \ + echo "**"; \ + echo "** Warning: folder 'gmic-qt' was not found !"; \ + echo "** It is mandatory to compile the G'MIC plug-in for GIMP 'gmic_gimp_qt',"; \ + echo "** as well as the standalone Qt-based interface 'gmic_qt'."; \ + echo "** Trying to retrieve it, with: $$ cd ../../ && git clone https://github.com/c-koi/gmic-qt.git"; \ + echo "**"; \ +- if cd ../../ && git clone https://github.com/c-koi/gmic-qt.git; then \ ++ if cd ../ && git clone https://github.com/c-koi/gmic-qt.git; then \ + echo "**"; \ + echo "** Success !"; \ + echo "**"; \ +@@ -494,7 +494,6 @@ + echo "**"; \ + fi; \ + fi; \ +- if [ -d ../../gmic-qt ]; then ln -fs ../gmic-qt ..; fi \ + fi diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index ea56174989..b49108ed80 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,25 +1,41 @@ # Template file for 'gmic' pkgname=gmic -version=1.7.1 -revision=3 +version=2.0.2 +revision=1 +_communityhash=c43f88d9537c58be4eeac515282eec8096c4a797 +_qthash=c37a653270e69df1956b2614f0e9ce94934c4b06 hostmakedepends="pkg-config gimp" makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel libgomp-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel - gtk+-devel gimp-devel qt-devel" + gtk+-devel gimp-devel qt5-devel" short_desc="GREYC's Magic for Image Computing (image processing framework)" maintainer="Jakub Skrzypnik " license="CeCILL" homepage="http://gmic.eu/" -distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz" -checksum=27819ac198945a3c1ac0851a583b3946624b96612a00b5145281dbf4108f045f +distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz https://github.com/dtschump/gmic-community/archive/${_communityhash}.tar.gz + https://github.com/c-koi/gmic-qt/archive/${_qthash}.tar.gz" +checksum="7da9f08d62a9d23fc8badbc7c819cf76f4a9ce3db763710268fdcb80d83ecfc6 41f5cbd42a09c18c0e974a11113e4fc7181a9c607c40e677357e3df77be2bd9c + 0bb1683f7ad8f55476ec57e53d73454e05cb79fc55b297eb519b2a24df728b44" nopie=yes +pre_build() { + mv ${XBPS_BUILDDIR}/gmic-qt-${_qthash} ${wrksrc}/gmic-qt + mv ${XBPS_BUILDDIR}/gmic-community-${_communityhash} ${wrksrc}/zart +} + do_build() { sed -i 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' src/Makefile - make -C src all + sed -i 's#GMIC_PATH = ../../gmic/src/#GMIC_PATH = ../../src/#' zart/zart/zart.pro + cd zart/zart && qmake-qt5 -o Makefile zart.pro + cd ${wrksrc}/src && make all ${makejobs} + cd ${wrksrc}/zart/zart && make ${makejobs} } + do_install() { - make -C src install DESTDIR="${DESTDIR}" USR="/usr" + cd ${wrksrc}/src && make install DESTDIR="${DESTDIR}" USR="/usr" + cd ${wrksrc}/zart/zart && make install + cd ${wrksrc} + vbin zart/zart/zart vlicense COPYING }