[arch-commits] Commit in gmic/repos (4 files)

Mon Apr 8 10:07:25 UTC 2019

Date: Monday, April 8, 2019 @ 10:07:24
  Author: arojas
Revision: 450346

archrelease: copy trunk to community-staging-x86_64

Added:
  gmic/repos/community-staging-x86_64/
  gmic/repos/community-staging-x86_64/PKGBUILD
    (from rev 450345, gmic/trunk/PKGBUILD)
  gmic/repos/community-staging-x86_64/gmic-opencv4.patch
    (from rev 450345, gmic/trunk/gmic-opencv4.patch)
  gmic/repos/community-staging-x86_64/zart-opencv4.patch
    (from rev 450345, gmic/trunk/zart-opencv4.patch)

--------------------+
 PKGBUILD           |   82 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gmic-opencv4.patch |   12 +++++++
 zart-opencv4.patch |   39 ++++++++++++++++++++++++
 3 files changed, 133 insertions(+)

Copied: gmic/repos/community-staging-x86_64/PKGBUILD (from rev 450345, gmic/trunk/PKGBUILD)
===================================================================

--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-04-08 10:07:24 UTC (rev 450346)
@@ -0,0 +1,82 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: farid <farid at archlinuc-br.org>
+# Contributor: Archie <Mymaud at gmail.com>
+
+pkgbase=gmic
+pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
+pkgver=2.5.5
+pkgrel=2
+arch=(x86_64)
+url="https://gmic.eu/"
+license=(custom:CeCILL)
+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=('46246a7f37740cfba22b6ee77f509a9e874cc70b7e1169ef195dcf8bb2b98d13'
+            'c7ee3be4fb2ac4243537fd8344a5bbe46ebafa0cd66a6e5cb941bbdf718378ec'
+            '182c6723708302a8cee92bfb45a40ff09b8903c649ce856d0d8cd10aab0ee39b')
+
+prepare() {
+  sed -e 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' -i gmic-$pkgver/src/Makefile
+# 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 
+# fix build with openCV 4.0
+  cd gmic-$pkgver/src
+  patch -p1 -i "$srcdir"/gmic-opencv4.patch
+  cd ../zart
+  patch -p1 -i "$srcdir"/zart-opencv4.patch
+}
+
+build() {
+  cd gmic-$pkgver
+  make -C src cli lib libc WGET=/bin/true
+
+  cd gmic-qt
+  qmake GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none
+  make
+  qmake GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=gimp
+  make
+  qmake GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=krita
+  make  
+
+  cd ../zart
+  qmake GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on QMAKE_CXXFLAGS+=" -DOPENCV2_HEADERS"
+  make
+}
+
+package_gmic() {
+  pkgdesc="GREYC's Magic Image Converter: image processing framework"
+  depends=(opencv fftw curl)
+  optdepends=('qt5-base: for the Qt UI')
+
+  cd gmic-$pkgver/src
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  rm -r "$pkgdir"/usr/{bin/zart,lib/gimp,bin/gmic_krita_qt}
+}
+
+package_zart() {
+  pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam"
+  depends=(gmic qt5-base)
+
+  install -Dm755 gmic-$pkgver/zart/zart -t "$pkgdir"/usr/bin
+  install -Dm644 gmic-$pkgver/zart/Licence_CeCILL_V2-en.html -t "$pkgdir"/usr/share/licenses/$pkgname
+}
+
+package_gimp-plugin-gmic() {
+  pkgdesc="Gimp plugin for the G'MIC image processing framework"
+  depends=(gimp gmic qt5-base)
+
+  install -Dm755 gmic-$pkgver/gmic-qt/gmic_gimp_qt "$pkgdir"/usr/lib/gimp/2.0/plug-ins/gmic_gimp
+  install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_krita-plugin-gmic() {
+  pkgdesc="Krita plugin for the G'MIC image processing framework"
+  depends=(krita gmic)
+
+  install -Dm755 gmic-$pkgver/gmic-qt/gmic_krita_qt -t "$pkgdir"/usr/bin/
+  install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Copied: gmic/repos/community-staging-x86_64/gmic-opencv4.patch (from rev 450345, gmic/trunk/gmic-opencv4.patch)
===================================================================
--- community-staging-x86_64/gmic-opencv4.patch	                        (rev 0)
+++ community-staging-x86_64/gmic-opencv4.patch	2019-04-08 10:07:24 UTC (rev 450346)
@@ -0,0 +1,12 @@
+diff --git a/CImg.h b/CImg.h
+index af63bcb..c7757fc 100644
+--- a/CImg.h
++++ b/CImg.h
+@@ -417,6 +417,7 @@
+ #endif
+ #include <cstddef>
+ #include <opencv2/opencv.hpp>
++#include <opencv2/videoio/videoio_c.h>
+ #if CV_MAJOR_VERSION >=3
+ #define _cimg_fourcc cv::VideoWriter::fourcc
+ #else

Copied: gmic/repos/community-staging-x86_64/zart-opencv4.patch (from rev 450345, gmic/trunk/zart-opencv4.patch)
===================================================================
--- community-staging-x86_64/zart-opencv4.patch	                        (rev 0)
+++ community-staging-x86_64/zart-opencv4.patch	2019-04-08 10:07:24 UTC (rev 450346)
@@ -0,0 +1,39 @@
+diff --git a/include/VideoFileSource.h b/include/VideoFileSource.h
+index 0fda14e..8c15178 100644
+--- a/include/VideoFileSource.h
++++ b/include/VideoFileSource.h
+@@ -50,6 +50,8 @@
+ #if defined(HAS_OPENCV2_HEADERS) || defined(OPENCV2_HEADERS)
+ #include <opencv2/core/core_c.h>
+ #include <opencv2/highgui/highgui_c.h>
++#include <opencv2/videoio.hpp>
++#include <opencv2/videoio/videoio_c.h>
+ #else
+ #include <cv.h>
+ #include <highgui.h>
+diff --git a/include/WebcamSource.h b/include/WebcamSource.h
+index 8c1911a..9194385 100644
+--- a/include/WebcamSource.h
++++ b/include/WebcamSource.h
+@@ -51,6 +51,8 @@
+ #if defined(HAS_OPENCV2_HEADERS) || defined(OPENCV2_HEADERS)
+ #include <opencv2/core/core_c.h>
+ #include <opencv2/highgui/highgui_c.h>
++#include <opencv2/videoio.hpp>
++#include <opencv2/videoio/videoio_c.h>
+ #else
+ #include <cv.h>
+ #include <highgui.h>
+diff --git a/zart.pro b/zart.pro
+index d98a192..ddb2d3b 100644
+--- a/zart.pro
++++ b/zart.pro
+@@ -19,7 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): CONFIG += c++11
+ CONFIG	+= warn_on
+ QT_CONFIG -= no-pkg-config
+ CONFIG += link_pkgconfig
+-PKGCONFIG += opencv fftw3 zlib
++PKGCONFIG += opencv4 fftw3 zlib
+ # LIBS += -lfftw3_threads
+ DEFINES += cimg_use_fftw3 cimg_use_zlib
+ 

