Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20354
Modified Files: lensfun.info lensfun.patch Added Files: zgrviewer.info Log Message: from 10.[78] --- NEW FILE: zgrviewer.info --- Package: zgrviewer Version: 0.8.2 Revision: 1 Source: mirror:sourceforge:zvtm/%n/%n-%v.zip SourceDirectory: zgrviewer HomePage: http://zvtm.sourceforge.net/zgrviewer.html License: LGPL Description: Graph visualizer (for GraphViz graphs) Source-MD5: fdfe97e13306f9eb81440e74b246aecb DocFiles: overview.html CompileScript: true InstallScript: << mkdir -p %i/bin mkdir -p %i/lib/%n install target/%n-%v.jar %i/lib/%n install target/*.jar %i/lib/%n echo '#!/bin/sh' >zgrviewer echo 'java -Xmx2G -jar %p/lib/%n/%n-%v.jar $*' >>zgrviewer install zgrviewer %i/bin << Depends: system-java, graphviz Maintainer: Adrian Prantl <adr...@f4z.org> DescDetail: << ZGRViewer is a graph visualizer implemented in Java and based upon the Zoomable Visual Transformation Machine. It is specifically aimed at displaying graphs expressed using the DOT language from AT&T GraphViz and processed by programs dot, neato or others such as twopi. ZGRViewer is designed to handle large graphs, and offers a zoomable user interface (ZUI), which enables smooth zooming and easy navigation in the visualized structure. ZGRViewer should be able to load any file that uses the DOT language to describe the graph. << Index: lensfun.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/lensfun.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- lensfun.patch 18 Sep 2012 05:44:01 -0000 1.2 +++ lensfun.patch 4 Jun 2013 02:15:01 -0000 1.3 @@ -1,78 +1,14 @@ -diff -Nurd lensfun-0.2.3/build/mak/compiler/gcc.mak lensfun-0.2.3-patched/build/mak/compiler/gcc.mak ---- lensfun-0.2.3/build/mak/compiler/gcc.mak 2008-05-11 11:50:15.000000000 -0400 -+++ lensfun-0.2.3-patched/build/mak/compiler/gcc.mak 2009-03-18 16:55:53.000000000 -0400 -@@ -72,8 +72,14 @@ - - LINK.GCC.AR = $(GCC.AR) $(GCC.ARFLAGS) $@ $^ - LINK.GCC.EXEC = $(GCC.LD) -o $@ $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2 -+ -+ifeq ($(TARGET),mac) -+else -+RPATH.SONAME = -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" -+endif -+ - define LINK.GCC.SO -- $(GCC.LD) -o $@.$(SHARED.$3) -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2 -+ $(GCC.LD) -o $@.$(SHARED.$3) $(RPATH.SONAME) $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2 - ln -fs $(notdir $@.$(SHARED.$3)) $@.$(basename $(basename $(SHARED.$3))) - ln -fs $(notdir $@.$(basename $(basename $(SHARED.$3)))) $@ - endef -diff -Nurd lensfun-0.2.3/build/mak/host/mac.mak lensfun-0.2.3-patched/build/mak/host/mac.mak ---- lensfun-0.2.3/build/mak/host/mac.mak 2008-07-14 15:23:30.000000000 -0400 -+++ lensfun-0.2.3-patched/build/mak/host/mac.mak 2009-03-18 16:58:42.000000000 -0400 -@@ -5,12 +5,12 @@ - # $1 - file, $2 - target dir, $3 - mode - define SINGLE.INSTALL - if [ ! -d $2 ]; then install -m 0755 -d $2; fi -- if [ -L $1 ]; then cp -d $1 $2$(notdir $1); else install -m $3 $1 $2$(notdir $1); fi -+ if [ -L $1 ]; then cp -RP $1 $2$(notdir $1); else install -m $3 $1 $2$(notdir $1); fi - endef - - # $1 - directory, $2 - target dir, $3 - mode for files - define SINGLE.INSTALLDIR - if [ ! -d $2 ]; then install -m 0755 -d $2; fi -- cp -drP $1* $2 -+ cp -RP $1* $2 - find $2 -type f -print0 | xargs -0 chmod $3 - endef -diff -Nurd lensfun-0.2.3/libs/auxfun/image.cpp lensfun-0.2.3-patched/libs/auxfun/image.cpp ---- lensfun-0.2.3/libs/auxfun/image.cpp 2008-05-02 02:56:04.000000000 -0400 -+++ lensfun-0.2.3-patched/libs/auxfun/image.cpp 2012-09-18 01:20:27.000000000 -0400 -@@ -94,7 +94,7 @@ - - png_init_io (png, file); - -- if (setjmp (png->jmpbuf)) -+ if (setjmp (png_jmpbuf(png))) - // If we get here, we had a problem reading the file - goto nomem; - -@@ -157,7 +157,7 @@ - row_pointers = new png_bytep [Height]; - - if (!row_pointers -- || setjmp (png->jmpbuf)) // Set a new exception handler -+ || setjmp (png_jmpbuf(png))) // Set a new exception handler - { - delete [] row_pointers; - nomem: -@@ -214,7 +214,7 @@ - } - - /* Catch processing errors */ -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf(png))) - /* If we get here, we had a problem writing the file */ - goto error2; - -@@ -273,10 +273,6 @@ - /* It is REQUIRED to call this to finish writing the rest of the file */ - png_write_end (png, info); - -- /* if you malloced the palette, free it here */ -- if (info->palette) -- free (info->palette); -- - /* clean up after the write, and free any memory allocated */ - png_destroy_write_struct (&png, &info); +diff -ruN lensfun-0.2.7-orig/build/tibs/compiler/pkgconfig.mak lensfun-0.2.7/build/tibs/compiler/pkgconfig.mak +--- lensfun-0.2.7-orig/build/tibs/compiler/pkgconfig.mak 2010-02-19 14:03:22.000000000 -0500 ++++ lensfun-0.2.7/build/tibs/compiler/pkgconfig.mak 2013-03-21 09:44:35.000000000 -0400 +@@ -3,8 +3,9 @@ + ifdef CONF_LIBDIR + # Try to guess here if target supports pkgconfig + # - Any POSIX platform ++# - Macintosh + # - Cross-compiling on a POSIX target for WINDOWS (mingw32) +-ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/),) ++ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /mac/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/),) + XFNAME.PKGCONFIG = $(addprefix $$(OUT),$1) + MKDEPS.PKGCONFIG = $1 Index: lensfun.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/lensfun.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- lensfun.info 18 Sep 2012 05:44:01 -0000 1.2 +++ lensfun.info 4 Jun 2013 02:15:01 -0000 1.3 @@ -1,7 +1,7 @@ Info4: << Package: lensfun -Version: 0.2.3 -Revision: 3 +Version: 0.2.7 +Revision: 1 Description: Photographic lens library License: GPL/LGPL Maintainer: Benjamin Reed <lens...@fink.racoonfink.com> @@ -19,16 +19,15 @@ BuildDependsOnly: true Source: http://download.berlios.de/%n/%n-%v.tar.bz2 -Source-MD5: c5c04be4f53e3eef450ff4948d8f65b3 +Source-MD5: 6061cc2d00a42d3e62512878426fc841 PatchFile: %n.patch -PatchFile-MD5: c8ed47d6139beff8df1bf1fd1701253c +PatchFile-MD5: 13662b324d9eb8d0f7388d8701ed98e8 SetCFLAGS: -I%p/include SetLIBS: -L%p/lib NoSetCPPFLAGS: true NoSetLDFLAGS: true - -ConfigureParams: --libdir=%p/lib +ConfigureParams: --libdir=%p/lib --docdir=%p/share/doc/%n CompileScript: << #!/bin/sh -ev export PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH" @@ -38,12 +37,9 @@ InstallScript: << make install INSTALL_PREFIX=%d - rm -rf %i/lib/liblensfun.dylib - rm -rf %i/lib/liblensfun.dylib.0 - mv %i/lib/liblensfun.dylib.%v %i/lib/liblensfun.0.dylib + mv %i/lib/liblensfun.dylib %i/lib/liblensfun.0.dylib ln -sf liblensfun.0.dylib %i/lib/liblensfun.dylib install_name_tool -id %p/lib/liblensfun.0.dylib %i/lib/liblensfun.0.dylib - mv %i/share/doc/%n-%v %i/share/doc/%n << SplitOff: << Package: %N-shlibs @@ -56,7 +52,7 @@ Shlibs: %p/lib/liblensfun.0.dylib 0.0.0 %n (>= 0.2.3-1) << -Homepage: http://developer.berlios.de/projects/lensfun/ +Homepage: http://lensfun.berlios.de/ DescDetail: << The project provides a database of photographic lenses and a library that @@ -68,9 +64,7 @@ Hooray! Someone's crappy special home-grown build system. Easier to fix after the fact than to change the build system any more than I have to. ;) - - Upstream patch to allow use of libpng15 (may as well fix even - though png is only used for self-testing). See: - http://svn.berlios.de/viewvc/lensfun/trunk/libs/auxfun/image.cpp?r1=19&r2=132 + + Patch activates generating a .pc file. << << ------------------------------------------------------------------------------ How ServiceNow helps IT people transform IT departments: 1. A cloud service to automate IT design, transition and operations 2. Dashboards that offer high-level views of enterprise services 3. A single system of record for all IT processes http://p.sf.net/sfu/servicenow-d2d-j _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs