[arch-commits] Commit in gmic/repos/community-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Aug 24 22:18:05 UTC 2019
Date: Saturday, August 24, 2019 @ 22:18:04
Author: arojas
Revision: 501604
archrelease: copy trunk to community-x86_64
Added:
gmic/repos/community-x86_64/PKGBUILD
(from rev 501603, gmic/trunk/PKGBUILD)
gmic/repos/community-x86_64/zart-opencv4.patch
(from rev 501603, gmic/trunk/zart-opencv4.patch)
Deleted:
gmic/repos/community-x86_64/PKGBUILD
gmic/repos/community-x86_64/zart-opencv4.patch
--------------------+
PKGBUILD | 159 +++++++++++++++++++++++++--------------------------
zart-opencv4.patch | 61 +++++++------------
2 files changed, 102 insertions(+), 118 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-24 22:17:43 UTC (rev 501603)
+++ PKGBUILD 2019-08-24 22:18:04 UTC (rev 501604)
@@ -1,79 +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.6.7
-pkgrel=1
-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 zart-opencv4.patch)
-sha256sums=('2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff'
- '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/zart
- patch -p1 -i "$srcdir"/zart-opencv4.patch
-}
-
-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 501603, gmic/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-24 22:18:04 UTC (rev 501604)
@@ -0,0 +1,80 @@
+# 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.7.0
+pkgrel=1
+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 zart-opencv4.patch)
+sha256sums=('8629c39ca5fa02c44a462727d36f50557e1397af2feeddf39628608c028824d3'
+ 'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296')
+
+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/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 2019-08-24 22:17:43 UTC (rev 501603)
+++ zart-opencv4.patch 2019-08-24 22:18:04 UTC (rev 501604)
@@ -1,39 +0,0 @@
-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
-
Copied: gmic/repos/community-x86_64/zart-opencv4.patch (from rev 501603, gmic/trunk/zart-opencv4.patch)
===================================================================
--- zart-opencv4.patch (rev 0)
+++ zart-opencv4.patch 2019-08-24 22:18:04 UTC (rev 501604)
@@ -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