Date: Friday, March 15, 2019 @ 15:56:50
Author: arojas
Revision: 441918
archrelease: copy trunk to community-x86_64
Added:
gmic/repos/community-x86_64/PKGBUILD
(from rev 441917, gmic/trunk/PKGBUILD)
gmic/repos/community-x86_64/gmic-opencv4.patch
(from rev 441917, gmic/trunk/gmic-opencv4.patch)
gmic/repos/community-x86_64/zart-opencv4.patch
(from rev 441917, gmic/trunk/zart-opencv4.patch)
Deleted:
gmic/repos/community-x86_64/PKGBUILD
gmic/repos/community-x86_64/gmic-opencv4.patch
gmic/repos/community-x86_64/zart-opencv4.patch
--------------------+
PKGBUILD | 164 +++++++++++++++++++++++++--------------------------
gmic-opencv4.patch | 26 +++-----
zart-opencv4.patch | 78 ++++++++++++------------
3 files changed, 133 insertions(+), 135 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-15 15:56:23 UTC (rev 441917)
+++ PKGBUILD 2019-03-15 15:56:50 UTC (rev 441918)
@@ -1,82 +0,0 @@
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <mym...@gmail.com>
-
-pkgbase=gmic
-pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
-pkgver=2.4.5
-pkgrel=1
-arch=(x86_64)
-url="http://gmic.eu/";
-license=(custom:CeCILL)
-makedepends=(gimp qt5-base fftw openexr opencv git)
-source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz gmic-opencv4.patch
zart-opencv4.patch)
-sha256sums=('e87efa20abdedf5e0000c490669d76c8a8d16a9fafa27bc9e31b79b5cbc3277f'
- '1ffb4f8952be152ba2956a50ff6c39b078e547a4d3386cc2f34549124aefbed3'
- '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-x86_64/PKGBUILD (from rev 441917,
gmic/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-15 15:56:50 UTC (rev 441918)
@@ -0,0 +1,82 @@
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com>
+# Contributor: farid <farid at archlinuc-br.org>
+# Contributor: Archie <mym...@gmail.com>
+
+pkgbase=gmic
+pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
+pkgver=2.5.1
+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 gmic-opencv4.patch
zart-opencv4.patch)
+sha256sums=('ec36d5d43ba2be8ead7a39205f45614ff1a2e580c9df5109d54991f5c3e867f2'
+ '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
+}
Deleted: gmic-opencv4.patch
===================================================================
--- gmic-opencv4.patch 2019-03-15 15:56:23 UTC (rev 441917)
+++ gmic-opencv4.patch 2019-03-15 15:56:50 UTC (rev 441918)
@@ -1,14 +0,0 @@
-diff --git a/CImg.h b/CImg.h
-index af63bcb..c7757fc 100644
---- a/CImg.h
-+++ b/CImg.h
-@@ -414,8 +414,7 @@
- #define _cimg_redefine_False
- #endif
- #include <cstddef>
--#include "cv.h"
--#include "highgui.h"
-+#include <opencv2/videoio/videoio_c.h>
- #endif
-
- // Configure LibPNG support.
Copied: gmic/repos/community-x86_64/gmic-opencv4.patch (from rev 441917,
gmic/trunk/gmic-opencv4.patch)
===================================================================
--- gmic-opencv4.patch (rev 0)
+++ gmic-opencv4.patch 2019-03-15 15:56:50 UTC (rev 441918)
@@ -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
Deleted: zart-opencv4.patch
===================================================================
--- zart-opencv4.patch 2019-03-15 15:56:23 UTC (rev 441917)
+++ zart-opencv4.patch 2019-03-15 15:56:50 UTC (rev 441918)
@@ -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 441917,
gmic/trunk/zart-opencv4.patch)
===================================================================
--- zart-opencv4.patch (rev 0)
+++ zart-opencv4.patch 2019-03-15 15:56:50 UTC (rev 441918)
@@ -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
+
