diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
| commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
| tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /community/gmic | |
| parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
| parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'community/gmic')
| -rw-r--r-- | community/gmic/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/gmic/opencv-buildfix.patch | 15 |
2 files changed, 22 insertions, 4 deletions
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index dd2ee6b04..8237bdc36 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' 'mips64el') @@ -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 + |