Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ec5155482a7a3685247512a0a084ab05a4fefc7
commit 1ec5155482a7a3685247512a0a084ab05a4fefc7 Author: Devil505 <[email protected]> Date: Tue Apr 10 21:10:16 2012 +0200 gmic-1.5.1.1-1-i686 * fixing build * updating patch diff --git a/source/xapps-extra/gmic/FrugalBuild b/source/xapps-extra/gmic/FrugalBuild index de7ae5e..c6ca724 100644 --- a/source/xapps-extra/gmic/FrugalBuild +++ b/source/xapps-extra/gmic/FrugalBuild @@ -6,14 +6,14 @@ pkgver=1.5.1.1 pkgrel=1 pkgdesc="image procession framework" depends=('fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr') -makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick') +makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick' 'libqtcore') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_sep="_" Finclude sourceforge source=($source opencv-buildfix.patch) sha1sums=('23ee295aaad3fe91d144b8247c8806d931eb60dd' \ - '538159c18125557c1429e71b1dfe65b28e6dc903') + 'c1d17a4d77475a7ac0844d310fba6fcc666bc617') subpkgs=("${subpkgs[@]}" "gimp-plugin-gmic") subdescs=("${subdescs[@]}" "Gimp plugin for the GMIC image procession framework") @@ -24,19 +24,12 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') build() { Fcd $pkgname-$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 - Fconf - 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 - Fpatch opencv-buildfix.patch + Fpatchall make -C src all || Fdie make -C src install DESTDIR="$Fdestdir" USR=/usr || Fdie - install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE" + Fmkdir usr/share/bash-completion/completions/ + Fmv /etc/bash_completion.d/gmic /usr/share/bash-completion/completions/gmic + Frm /etc/bash_completion.d # gimp plugin Fmkdir usr/lib/gimp/2.0/plug-ins/ diff --git a/source/xapps-extra/gmic/opencv-buildfix.patch b/source/xapps-extra/gmic/opencv-buildfix.patch index caf02fe..9b48a48 100644 --- a/source/xapps-extra/gmic/opencv-buildfix.patch +++ b/source/xapps-extra/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 @@ -12,3 +12,67 @@ diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h +#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 @@ + + 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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
