Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv930/graphics
Modified Files:
gmic.info gmic.patch
Log Message:
gmic 1.5.7.1
Index: gmic.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gmic.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gmic.patch 25 Jul 2013 00:33:40 -0000 1.4
+++ gmic.patch 13 Oct 2013 10:44:56 -0000 1.5
@@ -1,39 +1,31 @@
---- a/zart/zart.pro.orig 2012-09-16 15:52:03.000000000 -0400
-+++ b/zart/zart.pro 2012-09-16 15:52:18.000000000 -0400
-@@ -4,9 +4,9 @@
- CONFIG += warn_on debug
-
- !macx {
-- INCLUDEPATH += .. ./include /usr/include/opencv ../src/
-+ INCLUDEPATH += .. ./include ../src/ @FINKPREFIX@/include/opencv
@FINKPREFIX@/include
- } else {
-- INCLUDEPATH += .. ./include /opt/local/include
/opt/local/include/opencv ../src/
-+ INCLUDEPATH += .. ./include ../src/ @FINKPREFIX@/include
@FINKPREFIX@/include/opencv
- }
-
- DEPENDPATH += ./include
---- a/src/Makefile.orig 2012-09-16 15:53:48.000000000 -0400
-+++ b/src/Makefile 2012-09-16 15:56:32.000000000 -0400
-@@ -47,16 +47,13 @@
- # Set correct variables and paths
- #---------------------------------
+diff -ruN gmic-1.5.7.1-orig/src/Makefile gmic-1.5.7.1/src/Makefile
+--- gmic-1.5.7.1-orig/src/Makefile 2013-09-18 06:58:08.000000000 -0400
++++ gmic-1.5.7.1/src/Makefile 2013-10-13 06:18:44.000000000 -0400
+@@ -47,7 +47,7 @@
+ # Set correct variables and paths.
+ #----------------------------------
OS := $(shell uname)
-CC = g++
+CC = g++-fsf-4.8 -MD
- ifeq ($(OS),GNU/kFreeBSD)
- OS = Linux
+ ifeq ($(OS),Linux)
+ OS = Unix
endif
- ifeq ($(OS),Darwin)
+@@ -57,13 +57,8 @@
+ ifeq ($(OS),GNU)
+ OS = Unix
+ endif
+-ifeq ($(OS),Darwin)
-PLUGINDIR = ~/Library/Application\ Support/Gimp/plug-ins
-USR = /opt/local
-else
PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
-USR = /usr
+-endif
+USR = @FINKPREFIX@
- endif
- ifeq ($(OS),MINGW32_NT-5.1)
+ ifeq ($(OSTYPE),msys)
EXE = .exe
-@@ -406,8 +403,7 @@
+ endif
+@@ -415,8 +410,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
@@ -43,3 +35,18 @@
uninstall:
rm -f $(DESTDIR)$(USR)/bin/gmic
+diff -ruN gmic-1.5.7.1-orig/zart/zart.pro gmic-1.5.7.1/zart/zart.pro
+--- gmic-1.5.7.1-orig/zart/zart.pro 2013-09-18 06:58:08.000000000 -0400
++++ gmic-1.5.7.1/zart/zart.pro 2013-10-13 06:16:12.000000000 -0400
+@@ -4,9 +4,9 @@
+ CONFIG += warn_on release
+
+ !macx {
+- INCLUDEPATH += .. ./include /usr/include/opencv ../src/
++ INCLUDEPATH += .. ./include ../src/ @FINKPREFIX@/include/opencv
@FINKPREFIX@/include
+ } else {
+- INCLUDEPATH += .. ./include /opt/local/include
/opt/local/include/opencv ../src/
++ INCLUDEPATH += .. ./include ../src/ @FINKPREFIX@/include/opencv
+ }
+
+ DEPENDPATH += ./include
Index: gmic.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/gmic.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gmic.info 25 Jul 2013 00:33:40 -0000 1.4
+++ gmic.info 13 Oct 2013 10:44:56 -0000 1.5
@@ -1,5 +1,5 @@
Package: gmic
-Version: 1.5.6.1
+Version: 1.5.7.1
Revision: 1
Description: GREYC's Magic Image Converter
License: DFSG-Approved
@@ -49,11 +49,11 @@
Secondary: http://downloads.sourceforge.net/%n/old/
<<
Source: mirror:custom:%n_%v.tar.gz
-Source-MD5: 06545a7c2f73b55b0d35e5f5544dce88
-Source-Checksum: SHA1(f34b365ec008afec8d93011989b6221dd7bb5073)
+Source-MD5: ac1562484888b69d50852bcec8f9823b
+Source-Checksum: SHA1(6799a5ee150affadbe16fc0d18f8eb7c87319608)
SourceDirectory: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: aee2b7f85409ec589cb0dcbd5474ab28
+PatchFile-MD5: ada3b6cca9310603bef8918fcd9c1f2a
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
