mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-09 00:17:31 +00:00
community/gmic to 2.6.2-1
This commit is contained in:
parent
d02f1a9b55
commit
07a175b18a
2 changed files with 5 additions and 20 deletions
|
@ -11,15 +11,14 @@ highmem=1
|
|||
|
||||
pkgbase=gmic
|
||||
pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
|
||||
pkgver=2.6.1
|
||||
pkgver=2.6.2
|
||||
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=('48de7045a36eb718d55b0dfd68a797380b5390af99c9737a4dfba0fb678ed2b4'
|
||||
'c7ee3be4fb2ac4243537fd8344a5bbe46ebafa0cd66a6e5cb941bbdf718378ec'
|
||||
source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch)
|
||||
sha256sums=('91106fb0762269ab316aeff75a65d77ed0248f5f298bd2577cd3b010528444cd'
|
||||
'182c6723708302a8cee92bfb45a40ff09b8903c649ce856d0d8cd10aab0ee39b')
|
||||
|
||||
prepare() {
|
||||
|
@ -28,9 +27,7 @@ prepare() {
|
|||
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
|
||||
cd gmic-$pkgver/zart
|
||||
patch -p1 -i "$srcdir"/zart-opencv4.patch
|
||||
|
||||
cd ..
|
||||
|
@ -39,7 +36,7 @@ prepare() {
|
|||
|
||||
build() {
|
||||
cd gmic-$pkgver
|
||||
make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS}
|
||||
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
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
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
|
Loading…
Reference in a new issue