Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/sword/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/pgadmin3/PKGBUILD
	libre/lame-libre/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/libwebkit/PKGBUILD
	testing/tracker/PKGBUILD
	testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
	testing/udev/0002-reinstate-TIMEOUT-handling.patch
	testing/udev/PKGBUILD

2 files changed, 80 insertions, 20 deletions

diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index ea204703d..4a7690194 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63596 2012-02-05 11:58:54Z ibiru $
+# $Id: PKGBUILD 69172 2012-04-09 23:02:59Z 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,8 +6,8 @@
 
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.0.8
-pkgrel=2
+pkgver=1.5.1.1
+pkgrel=1
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:CeCILL')
@@ -16,20 +16,13 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema
 options=('docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
 	opencv-buildfix.patch)
-md5sums=('530e733b81e3c1cca7f17bfad4a56821'
-         'f135182ced743c296e08ddd560fa6be9')
+md5sums=('858a1d8d06d19a1903feb5314a58c805'
+         '62515a0e477e71e11ee24f66b5799937')
 
 build() {
   cd "$srcdir/gmic-$pkgver"
-  CFLAGS+=" -Dcimg_use_lapack"
-  LDFLAGS="-llapack"
-  sed -i "s#-lhighgui#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  sed -i "s#-lcv#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  ./configure --prefix=/usr
-  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
-  sed -i 's|ln -s $(DESTDIR)$(USR)|ln -s $(USR)|' src/Makefile
+#  CFLAGS+=" -Dcimg_use_lapack"
+#  LDFLAGS="-llapack"
   patch -p1 <$srcdir/opencv-buildfix.patch
   make -C src all
 }
@@ -41,6 +34,9 @@ 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 7fda2ea54..69778ac93 100644
--- a/community/gmic/opencv-buildfix.patch
+++ b/community/gmic/opencv-buildfix.patch
@@ -1,9 +1,9 @@
-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
+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
@@ -13,3 +13,67 @@ diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h
  #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 @@
+ 
+ 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) 
+ 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/
+ 
+ distclean: clean
+