Update of /cvsroot/fink/dists/10.2/stable/main/finkinfo/graphics
In directory usw-pr-cvs1:/tmp/cvs-serv16332
Added Files:
libjpeg-6b-5.info libpng-1.0.12-6.info libpng-1.0.12-6.patch
libtiff-3.5.7-7.info libtiff-3.5.7-7.patch
Log Message:
moving to stable based on positive feedback and having Shlibs already
--- NEW FILE: libjpeg-6b-5.info ---
Package: libjpeg
Version: 6b
Revision: 5
Depends: %N-shlibs (= %v-%r), %N-bin
BuildDepends: fink (>= 0.9.9)
Source: ftp://ftp.uunet.de/pub/graphics/jpeg/jpegsrc.v%v.tar.gz
Source-MD5: dbd5f3b47ed13132f04c685d608a7547
SourceDirectory: jpeg-%v
UpdateConfigGuess: true
UpdateLibtool: true
ConfigureParams: --enable-shared --enable-static
InstallScript: <<
mkdir -p %i/bin %i/include %i/lib %i/share/man/man1
make install prefix=%i mandir=%i/share/man/man1
<<
DocFiles: README
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Replaces: libjpeg (<< 6b-3)
Suggests: %N-bin
Files: lib/libjpeg.62.0.0.dylib lib/libjpeg.62.dylib
Shlibs: <<
%p/lib/libjpeg.62.dylib %n (>= %v-%r)
<<
DocFiles: README
<<
SplitOff2: <<
Package: %N-bin
Replaces: libjpeg (<< 6b-3)
Depends: %N-shlibs (= %v-%r)
Files: bin share/man
DocFiles: README libjpeg.doc structure.doc usage.doc wizard.doc
<<
Description: JPEG image format handling library
DescPort: <<
Uses autoconf and libtool. Requires the usual fixes.
Previous versions by Christoph Pfisterer.
<<
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
Homepage: http://www.ijg.org/
License: OSI-Approved
--- NEW FILE: libpng-1.0.12-6.info ---
Package: libpng
Version: 1.0.12
Revision: 6
Depends: libpng-shlibs (= %v-%r)
BuildDepends: fink (>= 0.9.9)
Replaces: libpng3
Conflicts: libpng3
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 3329b745968e41f6f9e55a4d04a4964c
Patch: %f.patch
PatchScript: ln -s scripts/makefile.darwin Makefile
CompileScript: make prefix=%p ZLIBLIB=%p/lib ZLIBINC=%p/include
InstallScript: <<
make install prefix=%i ZLIBLIB=%p/lib ZLIBINC=%p/include
<<
DocFiles: LICENSE README ANNOUNCE Y2KINFO KNOWNBUG
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Replaces: libpng (<< 1.0.12-3)
Files: lib/libpng.2.%v.dylib lib/libpng.2.dylib
Shlibs: <<
%p/lib/libpng.2.dylib libpng-shlibs (>= 1.0.12-7)
<<
DocFiles: LICENSE README ANNOUNCE Y2KINFO KNOWNBUG
<<
Description: PNG image format handling library
DescPort: <<
Doesn't use autoconf. Comes with a big selection of Makefiles
instead. The included Makefile for Mac OS X only builds static
libraries, so we use our own Makefile.
Previous versions by Christoph Pfisterer.
<<
License: OSI-Approved
Homepage: http://www.libpng.org/pub/png/
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
--- NEW FILE: libpng-1.0.12-6.patch ---
diff -ruN libpng-1.0.12/scripts/makefile.darwin
libpng-1.0.12-patched/scripts/makefile.darwin
--- libpng-1.0.12/scripts/makefile.darwin Thu Jan 1 01:00:00 1970
+++ libpng-1.0.12-patched/scripts/makefile.darwin Tue Jun 26 20:24:21 2001
@@ -0,0 +1,106 @@
+# makefile for libpng on Darwin / Mac OS X
+# Copyright (C) 2001 Christoph Pfisterer
+# derived from makefile.linux:
+# Copyright (C) 1998, 1999 Greg Roelofs
+# Copyright (C) 1996, 1997 Andreas Dilger
+# For conditions of distribution and use, see copyright notice in png.h
+
+# where "make install" puts libpng.a, libpng.dylib, png.h and pngconf.h
+prefix=/usr/local
+
+# Where the zlib library and include files are located
+#ZLIBLIB=/usr/local/lib
+#ZLIBINC=/usr/local/include
+ZLIBLIB=../zlib
+ZLIBINC=../zlib
+
+CC=cc
+CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
+
+#RANLIB=echo
+RANLIB=ranlib
+
+# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
+# have to change it.
+PNGMAJ = 2
+PNGMIN = 1.0.12
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+INCPATH=$(prefix)/include
+LIBPATH=$(prefix)/lib
+
+OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
+ pngwtran.o pngmem.o pngerror.o pngpread.o
+
+OBJSDLL = $(OBJS:.o=.pic.o)
+
+.SUFFIXES: .c .o .pic.o
+
+.c.pic.o:
+ $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
+
+all: libpng.a libpng.dylib pngtest
+
+libpng.a: $(OBJS)
+ ar rc $@ $(OBJS)
+ $(RANLIB) $@
+
+libpng.dylib: libpng.$(PNGMAJ).dylib
+ ln -sf libpng.$(PNGMAJ).dylib libpng.dylib
+
+libpng.$(PNGMAJ).dylib: libpng.$(PNGVER).dylib
+ ln -sf libpng.$(PNGVER).dylib libpng.$(PNGMAJ).dylib
+
+libpng.$(PNGVER).dylib: $(OBJSDLL)
+ $(CC) -dynamiclib \
+ -install_name $(LIBPATH)/libpng.$(PNGMAJ).dylib \
+ -current_version $(PNGMIN) -compatibility_version $(PNGMIN) \
+ -o libpng.$(PNGVER).dylib \
+ $(OBJSDLL) -L$(ZLIBLIB) -lz
+
+pngtest: pngtest.o libpng.dylib
+ $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+
+test: pngtest
+ ./pngtest
+
+install: libpng.a libpng.dylib
+ -@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi
+ -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi
+ cp png.h pngconf.h $(INCPATH)
+ chmod 644 $(INCPATH)/png.h $(INCPATH)/pngconf.h
+ cp libpng.a libpng.$(PNGVER).dylib $(LIBPATH)
+ chmod 755 $(LIBPATH)/libpng.$(PNGVER).dylib
+ ranlib $(LIBPATH)/libpng.a
+ -@/bin/rm -f $(LIBPATH)/libpng.$(PNGMAJ).dylib $(LIBPATH)/libpng.dylib
+ (cd $(LIBPATH); ln -sf libpng.$(PNGVER).dylib libpng.$(PNGMAJ).dylib; \
+ ln -sf libpng.$(PNGMAJ).dylib libpng.dylib)
+
+clean:
+ rm -f *.o libpng.a libpng.*dylib pngtest pngout.png
+
+DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
+writelock:
+ chmod a-w *.[ch35] $(DOCS) scripts/*
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+png.o png.pic.o: png.h pngconf.h
+pngerror.o pngerror.pic.o: png.h pngconf.h
+pngrio.o pngrio.pic.o: png.h pngconf.h
+pngwio.o pngwio.pic.o: png.h pngconf.h
+pngmem.o pngmem.pic.o: png.h pngconf.h
+pngset.o pngset.pic.o: png.h pngconf.h
+pngget.o pngget.pic.o: png.h pngconf.h
+pngread.o pngread.pic.o: png.h pngconf.h
+pngrtran.o pngrtran.pic.o: png.h pngconf.h
+pngrutil.o pngrutil.pic.o: png.h pngconf.h
+pngtrans.o pngtrans.pic.o: png.h pngconf.h
+pngwrite.o pngwrite.pic.o: png.h pngconf.h
+pngwtran.o pngwtran.pic.o: png.h pngconf.h
+pngwutil.o pngwutil.pic.o: png.h pngconf.h
+pngpread.o pngpread.pic.o: png.h pngconf.h
+
+pngtest.o: png.h pngconf.h
--- NEW FILE: libtiff-3.5.7-7.info ---
Package: libtiff
Version: 3.5.7
Revision: 7
Depends: %N-shlibs (= %v-%r), %N-bin
BuildDepends: libjpeg (>= 6b-3), fink (>= 0.9.9)
Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-v%v.tar.gz
Source-MD5: 82243b5ae9b7c9e492aeebc501680990
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
<<
CompileScript: <<
./configure --noninteractive
(export DESTDIR=%d; make)
<<
InstallScript: <<
mkdir -p %i/share/man
(export DESTDIR=%d; make install)
ranlib %i/lib/libtiff.a
mkdir -p %i/share/doc/%n/html
cp html/*.html %i/share/doc/%n/html/
mkdir -p %i/share/doc/%n/html/images
cp html/images/*.gif html/images/*.jpg %i/share/doc/%n/html/images/
mkdir -p %i/share/doc/%n/html/man
cp html/man/*.html %i/share/doc/%n/html/man/
<<
DocFiles: COPYRIGHT README
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Depends: libjpeg-shlibs (>= 1.1.3-6)
Replaces: libtiff (<< 3.5.7-5)
Suggests: %N-bin
Files: lib/libtiff.%v.dylib lib/libtiff.3.dylib
Shlibs: <<
%p/lib/libtiff.3.dylib %n (>= %v-%r)
<<
DocFiles: COPYRIGHT README
<<
SplitOff2: <<
Package: %N-bin
Depends: libjpeg-shlibs (>= 1.1.3-6), %N-shlibs (= %v-%r)
Replaces: libtiff (<< 3.5.7-5)
Files: bin share/man/man1
DocFiles: COPYRIGHT README
<<
Description: TIFF image format library and tools
DescPort: <<
Doesn't use autoconf. Comes with a self-built configure script.
Now includes shared library support for Darwin, but we make several
small patches to that (one related to the 10.1 upgrade), including
a patch which supplies current_version and compatibility_version.
DESTDIR support has been added upstream, so the previous gyrations
to get this to install are no longer necessary.
Previous versions by Christoph Pfisterer.
<<
License: BSD
Homepage: http://www.libtiff.org/
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
--- NEW FILE: libtiff-3.5.7-7.patch ---
diff -ru tiff-v3.5.7/config.site tiff-v3.5.7-patched/config.site
--- tiff-v3.5.7/config.site Mon Sep 24 15:59:43 2001
+++ tiff-v3.5.7-patched/config.site Fri Feb 1 16:39:38 2002
@@ -37,12 +37,15 @@
# interactive prompting done by the configure script.
#
+PREFIX=@PREFIX@
+
+
#
# Package controls.
#
-#DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system
-#JPEG="no" # yes|no configure JPEG support (see below)
-#ZIP="no" # yes|no configure Deflate support (see below)
+DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system
+JPEG="yes" # yes|no configure JPEG support (see below)
+ZIP="yes" # yes|no configure Deflate support (see below)
#LIBGL="auto" # yes|no|auto configure IRIS GL-based tools
#LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools
#HTML="no" # yes|no install HTML documentation
@@ -52,10 +55,10 @@
#
# Directory parameters.
#
-#DIR_BIN="/usr/local/bin" # directory for tools
-#DIR_LIB="/usr/local/lib" # directory for libraries
-#DIR_INC="/usr/local/include" # directory for include files
-#DIR_MAN="/usr/local/man" # directory for manual pages
+DIR_BIN="$PREFIX/bin" # directory for tools
+DIR_LIB="$PREFIX/lib" # directory for libraries
+DIR_INC="$PREFIX/include" # directory for include files
+DIR_MAN="$PREFIX/share/man" # directory for manual pages
#DIR_HTML="/var/httpd/htdocs/tiff" # directory for HTML documentation
#
@@ -97,7 +100,9 @@
# which you can find on the Internet at ftp.uu.net:/graphics/jpeg/.
#
#DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files
+DIRS_LIBINC="$DIRS_LIBINC $PREFIX/include"
#DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg
+DIR_JPEGLIB="$PREFIX/lib"
#
# Deflate-specific parameters; used when Deflate support is enabled (see above).
@@ -112,7 +117,9 @@
# Look for it also at ftp://ftp.uu.net/pub/archiving/zip/zlib.
#
#DIRS_LIBINC="$DIRS_LIBINC ../zlib" # directory for zlib include files
+DIRS_LIBINC="$DIRS_LIBINC $PREFIX/include" # directory for zlib include files
#DIR_GZLIB="../zlib" # directory for libz
+DIR_GZLIB="$PREFIX/lib" # directory for libz
#
# Miscellaneous parameters.
diff -ru tiff-v3.5.7/configure tiff-v3.5.7-patched/configure
--- tiff-v3.5.7/configure Thu Nov 15 12:21:05 2001
+++ tiff-v3.5.7-patched/configure Fri Feb 1 18:00:56 2002
@@ -1197,9 +1197,10 @@
DSOSUF=${DIST_MAJOR}.dylib
DSOSUF_VERSION=${DIST_MAJOR}.${DIST_MINOR}.${DIST_POINT}.dylib
LIBCOPTS='-fno-common'
- DSOLD=gcc
- DSOOPTS='-dynamiclib -undefined suppress'
+ DSOLD=cc
+ DSOOPTS='-dynamiclib'
DSO=DARWIN
+ DSOVERSTRING='-compatibility_version '${DIST_MAJOR}.${DIST_MINOR}'
+-current_version '${DIST_MAJOR}.${DIST_MINOR}.${DIST_POINT}
;;
*-linux*)
DSOSUF=so.${DIST_MAJOR}
@@ -1769,6 +1770,7 @@
s;@DSO@;${DSO};g
s;@DSOSUF@;${DSOSUF};g
s;@DSOSUF_VERSION@;${DSOSUF_VERSION};g
+s;@DSOVERSTRING@;${DSOVERSTRING};g
s;@ENVOPTS@;${ENVOPTS};g
s;@FILLORDER@;${FILLORDER};g
s;@GCOPTS@;${GCOPTS};g
diff -ru tiff-v3.5.7/libtiff/Makefile.in tiff-v3.5.7-patched/libtiff/Makefile.in
--- tiff-v3.5.7/libtiff/Makefile.in Sun Sep 9 11:56:04 2001
+++ tiff-v3.5.7-patched/libtiff/Makefile.in Fri Feb 1 17:36:43 2002
@@ -211,8 +211,9 @@
fi
touch $@
DARWINdso: ${OBJS}
- ${CC} -dynamiclib -undefined suppress \
- -install_name libtiff.@DSOSUF@ \
+ ${CC} -dynamiclib \
+ -install_name @DIR_LIB@/libtiff.@DSOSUF@ \
+ @DSOVERSTRING@ \
-o libtiff.@DSOSUF_VERSION@ ${OBJS} \
@LIBJPEG@ @LIBGZ@ @MACHDEPLIBS@
rm -f libtiff.@DSOSUF@
@@ -369,7 +370,7 @@
${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \
-lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \
${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \
- -lns libtiff.@DSOSUF@ -O libtiff.so; \
+ -lns libtiff.@DSOSUF@ -O libtiff.dylib; \
else \
${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@ \
-O libtiff.@DSOSUF@; \
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
