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

Antonio Rojas arojas at archlinux.org
Thu Jan 23 19:37:10 UTC 2020


    Date: Thursday, January 23, 2020 @ 19:37:09
  Author: arojas
Revision: 555239

archrelease: copy trunk to community-x86_64

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

--------------------+
 PKGBUILD           |  172 +++++++++++++++++++++++++--------------------------
 zart-opencv4.patch |   44 ++++++-------
 2 files changed, 108 insertions(+), 108 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-23 19:36:47 UTC (rev 555238)
+++ PKGBUILD	2020-01-23 19:37:09 UTC (rev 555239)
@@ -1,86 +0,0 @@
-# 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.8.2
-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=('09173c157a248d4c2c40b6250ae1058f1518665eedfb9f971ed1045fe652daea'
-            'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296'
-            'SKIP')
-
-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 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/zart
-  patch -p1 -i ../../zart-opencv4.patch
-  sed -e 's|opencv|opencv4|' -i zart.pro
-}
-
-build() {
-  cd gmic-$pkgver
-  make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} -j1
-
-  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-x86_64/PKGBUILD (from rev 555238, gmic/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-23 19:37:09 UTC (rev 555239)
@@ -0,0 +1,86 @@
+# 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.8.3
+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=('573a4f7731ba506a397c8080e60ad30bd3d4b686c51ec3d22d7f5de9a901547c'
+            'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296'
+            'SKIP')
+
+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 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/zart
+  patch -p1 -i ../../zart-opencv4.patch
+  sed -e 's|opencv|opencv4|' -i zart.pro
+}
+
+build() {
+  cd gmic-$pkgver
+  make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} -j1
+
+  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
+}

Deleted: zart-opencv4.patch
===================================================================
--- zart-opencv4.patch	2020-01-23 19:36:47 UTC (rev 555238)
+++ zart-opencv4.patch	2020-01-23 19:37:09 UTC (rev 555239)
@@ -1,22 +0,0 @@
-diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp
-index dc7605b..56f59db 100644
---- a/src/ImageConverter.cpp
-+++ b/src/ImageConverter.cpp
-@@ -70,7 +70,7 @@ void ImageConverter::convert(const cv::Mat * in, QImage * out)
- 
-   cv::Mat tmp(in->cols, in->rows, in->depth());
- 
--  cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB);
-+  cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB);
- 
-   const unsigned int w3 = 3 * tmp.cols;
-   unsigned char * src = reinterpret_cast<unsigned char *>(tmp.ptr());
-@@ -106,7 +106,7 @@ void ImageConverter::convert(const QImage & in, cv::Mat ** out)
-       dst += step;
-     }
-   }
--  cvtColor(**out, **out, CV_BGR2RGB);
-+  cvtColor(**out, **out, cv::COLOR_BGR2RGB);
- }
- 
- void ImageConverter::convert(const cimg_library::CImg<float> & in, QImage * out)

Copied: gmic/repos/community-x86_64/zart-opencv4.patch (from rev 555238, gmic/trunk/zart-opencv4.patch)
===================================================================
--- zart-opencv4.patch	                        (rev 0)
+++ zart-opencv4.patch	2020-01-23 19:37:09 UTC (rev 555239)
@@ -0,0 +1,22 @@
+diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp
+index dc7605b..56f59db 100644
+--- a/src/ImageConverter.cpp
++++ b/src/ImageConverter.cpp
+@@ -70,7 +70,7 @@ void ImageConverter::convert(const cv::Mat * in, QImage * out)
+ 
+   cv::Mat tmp(in->cols, in->rows, in->depth());
+ 
+-  cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB);
++  cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB);
+ 
+   const unsigned int w3 = 3 * tmp.cols;
+   unsigned char * src = reinterpret_cast<unsigned char *>(tmp.ptr());
+@@ -106,7 +106,7 @@ void ImageConverter::convert(const QImage & in, cv::Mat ** out)
+       dst += step;
+     }
+   }
+-  cvtColor(**out, **out, CV_BGR2RGB);
++  cvtColor(**out, **out, cv::COLOR_BGR2RGB);
+ }
+ 
+ void ImageConverter::convert(const cimg_library::CImg<float> & in, QImage * out)



More information about the arch-commits mailing list