Sun Aug 5 00:04:11 UTC 2012

2 files changed, 29 insertions, 79 deletions

diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 46d2a241e..0729d863a 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70246 2012-05-03 01:48:06Z foutrelis $
+# $Id: PKGBUILD 74752 2012-08-03 10:54:18Z 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,18 +6,18 @@
 
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.1.2
-pkgrel=2
+pkgver=1.5.1.7
+pkgrel=1
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64')
 license=('custom:CeCILL')
 url="http://gmic.sourceforge.net"
-makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick')
+makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick' 'qt')
 options=('docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
 	opencv-buildfix.patch)
-md5sums=('1599803b0c60aa834cdc4f6200db5335'
-         '62515a0e477e71e11ee24f66b5799937')
+md5sums=('da53449144f0edc9431358118e574e7c'
+         '8d1cf5000239099255d25c7d3dbe5728')
 
 build() {
   cd "$srcdir/gmic-$pkgver"
@@ -32,9 +32,6 @@ package_gmic() {
   cd "$srcdir/gmic-$pkgver"
   make -C src install DESTDIR="$pkgdir" USR=/usr
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE"
-  mkdir -p $pkgdir/usr/share/bash-completion/completions/
-  mv $pkgdir/etc/bash_completion.d/gmic $pkgdir/usr/share/bash-completion/completions/gmic
-  rm -rf $pkgdir/etc/bash_completion.d
 }
 
 package_gimp-plugin-gmic() {
diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch
index 69778ac93..b204cb721 100644
--- a/community/gmic/opencv-buildfix.patch
+++ b/community/gmic/opencv-buildfix.patch
@@ -1,79 +1,32 @@
-diff -wbBur gmic-1.5.1.1/src/CImg.h gmic-1.5.1.1.my/src/CImg.h
---- gmic-1.5.1.1/src/CImg.h	2012-04-06 17:47:06.000000000 +0400
-+++ gmic-1.5.1.1.my/src/CImg.h	2012-04-10 02:10:19.000000000 +0400
-@@ -243,7 +243,11 @@
- #define _cimg_redefine_False
- #endif
- #include <cstddef>
-+#undef True
-+#undef False
- #include "cv.h"
-+#define True 1
-+#define False 0
- #include "highgui.h"
- #endif
- 
-diff -wbBur gmic-1.5.1.1/src/Makefile gmic-1.5.1.1.my/src/Makefile
---- gmic-1.5.1.1/src/Makefile	2012-04-06 17:47:05.000000000 +0400
-+++ gmic-1.5.1.1.my/src/Makefile	2012-04-10 02:39:09.000000000 +0400
-@@ -164,12 +164,12 @@
- # Flags to enable native support of webcams, using the OpenCV library.
- # This requires the presence of the OpenCV include and library files.
- # (package 'libcv3-2-dev' on Debian).
--OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
-+OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`
- ifeq ($(OS),Darwin)
--OPENCV_LDFLAGS = `pkg-config opencv --libs`   # Use this for OpenCV 2.2.0 !
-+OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
- else
--OPENCV_LDFLAGS = -lcv -lhighgui
--# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
-+OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
-+# OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
- endif
- 
- # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
-@@ -270,7 +270,6 @@
- 	$(MAKE) bashcompletion
- 	$(MAKE) gimp
- 	$(MAKE) lib
--	$(MAKE) zart
- else
- ifeq ($(OS),Darwin)
- 	@echo "**"
-@@ -297,7 +296,7 @@
+diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile
+--- gmic-1.5.1.7/src/Makefile	2012-07-26 12:59:34.000000000 +0400
++++ gmic-1.5.1.7.q/src/Makefile	2012-08-03 14:03:10.000000000 +0400
+@@ -296,7 +296,7 @@
  
  zart: lib
  ifneq ($(OS),Darwin)
 -	cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
 +	cd ../zart && qmake zart.pro && $(MAKE) && strip zart
  else
- 	cd ../zart && qmake zart_mac.pro && $(MAKE) 
+ 	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
  endif
-@@ -386,16 +385,13 @@
- # Install/uninstall/clean.
- install:
- 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
--	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
-+	
- 	mkdir -p $(DESTDIR)$(USR)/bin/
- 	cp -f gmic $(DESTDIR)$(USR)/bin/
- 	mkdir -p $(DESTDIR)$(USR)/include/
- 	cp -f gmic.h $(DESTDIR)$(USR)/include/
- ifneq ($(OS),Darwin)
- 	mkdir -p $(DESTDIR)$(USR)/share
--	mkdir -p $(DESTDIR)$(USR)/share/zart
--	cp -f ../zart/haar*.xml $(DESTDIR)$(USR)/share/zart
--	cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart
- 	mkdir -p $(DESTDIR)$(USR)/lib
- 	cp -f libgmic.so $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1.1
- 	ln -s libgmic.so.1.5.1.1 $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1
-@@ -420,8 +416,6 @@
- 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
- 	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
- 	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
--	rm -f $(DESTDIR)$(USR)/bin/zart
--	rm -rf $(DESTDIR)$(USR)/share/zart/
+@@ -403,6 +403,7 @@
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
+ 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+ 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi
+ 	if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
+ 	if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
  
- distclean: clean
+diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro
+--- gmic-1.5.1.7/zart/zart.pro	2012-07-26 12:59:33.000000000 +0400
++++ gmic-1.5.1.7.q/zart/zart.pro	2012-08-03 12:32:27.000000000 +0400
+@@ -34,7 +34,7 @@
+ FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui
  
+ !macx {
+-	LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3
++	LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3
+ } else {
+ 	LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3
+ }