diff options
| author | root <root@rshg054.dnsready.net> | 2012-04-11 00:01:18 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-04-11 00:01:18 +0000 |
| commit | 04aff5f70cb7c04abe06ca8eaf8261cbb0eeb378 (patch) | |
| tree | 4935a4f0959f9560df7fba4989a0de1dc361884e /community/gmic/opencv-buildfix.patch | |
| parent | 223ca251f3ce07eb5484be845e631d6ca645b263 (diff) | |
Wed Apr 11 00:01:18 UTC 2012
Diffstat (limited to 'community/gmic/opencv-buildfix.patch')
| -rw-r--r-- | community/gmic/opencv-buildfix.patch | 76 |
1 files changed, 70 insertions, 6 deletions
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 + |