From 5442e9b8f357932ed5d6cb46e90fcbf6f453469f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 6 Oct 2011 23:14:37 +0000
Subject: Thu Oct  6 23:14:37 UTC 2011

---
 community/gmic/PKGBUILD              | 11 +++++++----
 community/gmic/opencv-buildfix.patch | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 community/gmic/opencv-buildfix.patch

(limited to 'community/gmic')

diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index a508a3029..d9c11df10 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 52163 2011-07-20 22:09:09Z spupykin $
+# $Id: PKGBUILD 56316 2011-10-05 15:22:43Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,7 +6,7 @@
 
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.0.0
+pkgver=1.5.0.3
 pkgrel=1
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64')
@@ -14,8 +14,10 @@ license=('custom:CeCILL')
 url="http://gmic.sourceforge.net"
 makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick')
 options=('docs' '!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz")
-md5sums=('6ea2d9b3be294d79cd83364c03303a96')
+source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
+	opencv-buildfix.patch)
+md5sums=('beb98c3f257d664da750455a98cc3aa9'
+         'f135182ced743c296e08ddd560fa6be9')
 
 build() {
   cd "$srcdir/gmic-$pkgver"
@@ -27,6 +29,7 @@ build() {
   sed -i 's|OPENCV_CFLAGS = .*|OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`|' src/Makefile
   sed -i 's|OPENCV_LDFLAGS = .*|OPENCV_LDFLAGS = `pkg-config --libs opencv`|' src/Makefile
   sed -i 's|cp -f gmic_gimp.*||' src/Makefile
+  patch -p1 <$srcdir/opencv-buildfix.patch
   make -C src all
 }
 
diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch
new file mode 100644
index 000000000..7fda2ea54
--- /dev/null
+++ b/community/gmic/opencv-buildfix.patch
@@ -0,0 +1,15 @@
+diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h
+--- gmic-1.5.0.3.org/src/CImg.h	2011-09-22 18:37:54.000000000 +0400
++++ gmic-1.5.0.3/src/CImg.h	2011-10-05 18:03:25.000000000 +0400
+@@ -234,7 +234,11 @@
+ // Using OpenCV is not mandatory.
+ #ifdef cimg_use_opencv
+ #include <cstddef>
++#undef True
++#undef False
+ #include "cv.h"
++#define True 1
++#define False 0
+ #include "highgui.h"
+ #endif
+ 
-- 
cgit v1.2.3-54-g00ecf