upgrade to libtiff 3.5.4, biggest change:

- Removed LZW Compression to comply with Unisys patent extortion
- Changed default compression in tools to TIFF_PACKBITS, and changed usage
descriptions in tools to reflect removal of LZW compression
- Added Pixar tag support
This commit is contained in:
brad 2000-01-01 21:28:30 +00:00
parent efcb8ae111
commit 48ace64959
9 changed files with 87 additions and 83 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.5 1999/10/26 22:05:20 brad Exp $
# $OpenBSD: Makefile,v 1.6 2000/01/01 21:28:30 brad Exp $
DISTNAME= tiff-v3.5.2
PKGNAME= tiff-3.5.2
DISTNAME= tiff-v3.5.4
PKGNAME= tiff-3.5.4
CATEGORIES= graphics
MASTER_SITES= http://www.libtiff.org/
@ -21,7 +21,7 @@ CONFIGURE_ARGS= --with-ZIP --with-JPEG --with-DIR_BIN="${PREFIX}/bin" \
--with-DIR_GZLIB="/usr/lib" \
--with-DIR_JPEGLIB="${PREFIX}/lib" \
--with-LIBGL="no" --with-LIBIMAGE="no" \
--with-INSTALL="${SH} ${WRKSRC}/port/install.sh" \
--with-INSTALL="sh ${WRKSRC}/port/install.sh" \
--noninteractive
DOCDIR= ${PREFIX}/share/doc/tiff

View File

@ -1,3 +1,3 @@
MD5 (tiff-v3.5.2.tar.gz) = 2c498457556723485d488eb12c12fe95
RMD160 (tiff-v3.5.2.tar.gz) = 11f171120aa57d1e7019fcbd5f8e8788561add23
SHA1 (tiff-v3.5.2.tar.gz) = 85a395ad209796e54fb31a6a86e9163506cd8960
MD5 (tiff-v3.5.4.tar.gz) = 3957aeace6b66720751f497157e16e53
RMD160 (tiff-v3.5.4.tar.gz) = 6e0b616b55054d9a561993fa18d0a14bbd654733
SHA1 (tiff-v3.5.4.tar.gz) = 41c9b5523a0b66f941ba496db8b9c2425336e454

View File

@ -1,15 +1,14 @@
--- libtiff/Makefile.in.orig Wed Sep 8 05:39:00 1999
+++ libtiff/Makefile.in Thu Nov 4 13:58:18 1999
@@ -62,7 +62,7 @@
--- libtiff/Makefile.in.orig Tue Dec 21 18:12:48 1999
+++ libtiff/Makefile.in Tue Dec 21 18:16:04 1999
@@ -62,7 +62,6 @@
#
CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@
COPTS = @GCOPTS@
-OPTIMIZER=-O
+#OPTIMIZER=-O
CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
#
SRCS = \
@@ -216,6 +216,9 @@
@@ -216,6 +215,9 @@
OSFdso: ${OBJS}
${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
@ -19,21 +18,21 @@
${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h
${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h
@@ -323,15 +326,8 @@
@@ -323,15 +325,9 @@
-src $$i -O $$f; \
done
installDSO: @DSO@dso
- if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \
- ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \
- -O libtiff.@DSOSUF_VERSION@; \
+ ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F @DIR_LIB@ \
-O libtiff.@DSOSUF_VERSION@; \
- ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \
- -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \
- else \
- ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \
- -O libtiff.@DSOSUF@; \
- fi
+ ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F @DIR_LIB@ \
+ -O libtiff.@DSOSUF_VERSION@;
+
install: all installHdrs
${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@
${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a

View File

@ -12,7 +12,7 @@
+ ;;
+ *-openbsd*)
+ DSOSUF=so
+ DSOSUF_VERSION=${DSOSUF}.35.2
+ DSOSUF_VERSION=${DSOSUF}.35.4
+ LIBCOPTS='-fpic'
+ DSO=OPENBSD
+ TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'

View File

@ -1,11 +1,10 @@
--- tools/Makefile.in.orig Thu Aug 19 06:03:27 1999
+++ tools/Makefile.in Fri Oct 22 16:53:31 1999
@@ -43,17 +43,17 @@
--- tools/Makefile.in.orig Mon Dec 20 18:46:11 1999
+++ tools/Makefile.in Sat Jan 1 16:15:04 2000
@@ -43,17 +43,16 @@
INSTALL = @INSTALL@
#
COPTS = @GCOPTS@
-OPTIMIZER=-O
+#OPTIMIZER=-O
IPATH = -I. -I${SRCDIR} -I${LIBDIR}
-CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
+CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff
@ -22,3 +21,14 @@
#
OBJS= \
fax2tiff.o \
@@ -108,8 +107,8 @@
true; \
fi
install: all
- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@
- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
+ ${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
+ ${INSTALL} -idb nostrip tiff.sw.tools.nostrip -m 755 -F @DIR_BIN@ -O ${TARGETS}
@if [ "@LIBIMAGE@" = yes ]; then \
${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
else \

View File

@ -1,13 +0,0 @@
--- contrib/ras/ras2tif.c.orig Wed Apr 14 23:05:05 1999
+++ contrib/ras/ras2tif.c Wed Apr 14 23:05:41 1999
@@ -102,8 +102,8 @@
gettimeofday(&tv, (struct timezone *) NULL);
ct = localtime(&tv.tv_sec);
- sprintf(datetime, "19%02d:%02d:%02d %02d:%02d:%02d",
- ct->tm_year, ct->tm_mon + 1, ct->tm_mday,
+ sprintf(datetime, "%04d:%02d:%02d %02d:%02d:%02d",
+ 1900 + ct->tm_year, ct->tm_mon + 1, ct->tm_mday,
ct->tm_hour, ct->tm_min, ct->tm_sec);
setbuf(stderr, NULL);

View File

@ -1,5 +1,5 @@
--- man/Makefile.in.orig Thu Aug 19 06:03:25 1999
+++ man/Makefile.in Fri Oct 22 17:44:40 1999
--- man/Makefile.in.orig Mon Nov 29 11:42:44 1999
+++ man/Makefile.in Tue Dec 21 18:20:00 1999
@@ -41,6 +41,7 @@
SED = sed
MV = mv
@ -17,7 +17,7 @@
MANTOOLS=\
apps/fax2tiff.1 \
@@ -272,59 +273,59 @@
@@ -274,59 +275,59 @@
lib/TIFFswab.3t:: ${SRCDIR}/TIFFswab.3t; ${MANCVT}
lib/TIFFtile.3t:: ${SRCDIR}/TIFFtile.3t; ${MANCVT}

View File

@ -1,14 +1,14 @@
bin/fax2tiff
bin/fax2ps
bin/fax2tiff
bin/gif2tiff
bin/pal2rgb
bin/ppm2tiff
bin/ras2tiff
bin/rgb2ycbcr
bin/thumbnail
bin/ras2tiff
bin/tiff2rgba
bin/tiff2bw
bin/tiff2ps
bin/tiff2rgba
bin/tiffcmp
bin/tiffcp
bin/tiffdither
@ -16,11 +16,12 @@ bin/tiffdump
bin/tiffinfo
bin/tiffmedian
bin/tiffsplit
lib/libtiff.a
lib/libtiff.so.35.2
@exec /sbin/ldconfig -m %B
include/tiff.h
include/tiffconf.h
include/tiffio.h
lib/libtiff.a
lib/libtiff.so.35.4
@exec /sbin/ldconfig -m %B
man/man1/fax2ps.1
man/man1/fax2tiff.1
man/man1/gif2tiff.1
@ -74,13 +75,13 @@ man/man3/TIFFRGBAImageBegin.3t
man/man3/TIFFRGBAImageEnd.3t
man/man3/TIFFRGBAImageGet.3t
man/man3/TIFFRGBAImageOK.3t
man/man3/TIFFReadRGBAStrip.3t
man/man3/TIFFReadRGBATile.3t
man/man3/TIFFReadBufferSetup.3t
man/man3/TIFFReadDirectory.3t
man/man3/TIFFReadEncodedStrip.3t
man/man3/TIFFReadEncodedTile.3t
man/man3/TIFFReadRGBAImage.3t
man/man3/TIFFReadRGBAStrip.3t
man/man3/TIFFReadRGBATile.3t
man/man3/TIFFReadRawStrip.3t
man/man3/TIFFReadRawTile.3t
man/man3/TIFFReadScanline.3t
@ -133,6 +134,22 @@ share/doc/tiff/build.html
share/doc/tiff/contrib.html
share/doc/tiff/document.html
share/doc/tiff/images.html
share/doc/tiff/images/back.gif
share/doc/tiff/images/bali.jpg
share/doc/tiff/images/cat.gif
share/doc/tiff/images/cover.jpg
share/doc/tiff/images/cramps.gif
share/doc/tiff/images/dave.gif
share/doc/tiff/images/info.gif
share/doc/tiff/images/jello.jpg
share/doc/tiff/images/jim.gif
share/doc/tiff/images/note.gif
share/doc/tiff/images/oxford.gif
share/doc/tiff/images/quad.jpg
share/doc/tiff/images/ring.gif
share/doc/tiff/images/smallliz.jpg
share/doc/tiff/images/strike.gif
share/doc/tiff/images/warning.gif
share/doc/tiff/index.html
share/doc/tiff/internals.html
share/doc/tiff/intro.html
@ -152,21 +169,8 @@ share/doc/tiff/v3.4beta033.html
share/doc/tiff/v3.4beta034.html
share/doc/tiff/v3.4beta035.html
share/doc/tiff/v3.4beta036.html
share/doc/tiff/images/back.gif
share/doc/tiff/images/bali.jpg
share/doc/tiff/images/cat.gif
share/doc/tiff/images/cover.jpg
share/doc/tiff/images/cramps.gif
share/doc/tiff/images/dave.gif
share/doc/tiff/images/info.gif
share/doc/tiff/images/jello.jpg
share/doc/tiff/images/jim.gif
share/doc/tiff/images/note.gif
share/doc/tiff/images/oxford.gif
share/doc/tiff/images/quad.jpg
share/doc/tiff/images/ring.gif
share/doc/tiff/images/smallliz.jpg
share/doc/tiff/images/strike.gif
share/doc/tiff/images/warning.gif
share/doc/tiff/v3.5.1.html
share/doc/tiff/v3.5.2.html
share/doc/tiff/v3.5.3.html
@dirrm share/doc/tiff/images
@dirrm share/doc/tiff

View File

@ -1,14 +1,14 @@
bin/fax2tiff
bin/fax2ps
bin/fax2tiff
bin/gif2tiff
bin/pal2rgb
bin/ppm2tiff
bin/ras2tiff
bin/rgb2ycbcr
bin/thumbnail
bin/ras2tiff
bin/tiff2rgba
bin/tiff2bw
bin/tiff2ps
bin/tiff2rgba
bin/tiffcmp
bin/tiffcp
bin/tiffdither
@ -16,9 +16,10 @@ bin/tiffdump
bin/tiffinfo
bin/tiffmedian
bin/tiffsplit
lib/libtiff.a
include/tiff.h
include/tiffconf.h
include/tiffio.h
lib/libtiff.a
man/man1/fax2ps.1
man/man1/fax2tiff.1
man/man1/gif2tiff.1
@ -72,13 +73,13 @@ man/man3/TIFFRGBAImageBegin.3t
man/man3/TIFFRGBAImageEnd.3t
man/man3/TIFFRGBAImageGet.3t
man/man3/TIFFRGBAImageOK.3t
man/man3/TIFFReadRGBAStrip.3t
man/man3/TIFFReadRGBATile.3t
man/man3/TIFFReadBufferSetup.3t
man/man3/TIFFReadDirectory.3t
man/man3/TIFFReadEncodedStrip.3t
man/man3/TIFFReadEncodedTile.3t
man/man3/TIFFReadRGBAImage.3t
man/man3/TIFFReadRGBAStrip.3t
man/man3/TIFFReadRGBATile.3t
man/man3/TIFFReadRawStrip.3t
man/man3/TIFFReadRawTile.3t
man/man3/TIFFReadScanline.3t
@ -131,6 +132,22 @@ share/doc/tiff/build.html
share/doc/tiff/contrib.html
share/doc/tiff/document.html
share/doc/tiff/images.html
share/doc/tiff/images/back.gif
share/doc/tiff/images/bali.jpg
share/doc/tiff/images/cat.gif
share/doc/tiff/images/cover.jpg
share/doc/tiff/images/cramps.gif
share/doc/tiff/images/dave.gif
share/doc/tiff/images/info.gif
share/doc/tiff/images/jello.jpg
share/doc/tiff/images/jim.gif
share/doc/tiff/images/note.gif
share/doc/tiff/images/oxford.gif
share/doc/tiff/images/quad.jpg
share/doc/tiff/images/ring.gif
share/doc/tiff/images/smallliz.jpg
share/doc/tiff/images/strike.gif
share/doc/tiff/images/warning.gif
share/doc/tiff/index.html
share/doc/tiff/internals.html
share/doc/tiff/intro.html
@ -150,21 +167,8 @@ share/doc/tiff/v3.4beta033.html
share/doc/tiff/v3.4beta034.html
share/doc/tiff/v3.4beta035.html
share/doc/tiff/v3.4beta036.html
share/doc/tiff/images/back.gif
share/doc/tiff/images/bali.jpg
share/doc/tiff/images/cat.gif
share/doc/tiff/images/cover.jpg
share/doc/tiff/images/cramps.gif
share/doc/tiff/images/dave.gif
share/doc/tiff/images/info.gif
share/doc/tiff/images/jello.jpg
share/doc/tiff/images/jim.gif
share/doc/tiff/images/note.gif
share/doc/tiff/images/oxford.gif
share/doc/tiff/images/quad.jpg
share/doc/tiff/images/ring.gif
share/doc/tiff/images/smallliz.jpg
share/doc/tiff/images/strike.gif
share/doc/tiff/images/warning.gif
share/doc/tiff/v3.5.1.html
share/doc/tiff/v3.5.2.html
share/doc/tiff/v3.5.3.html
@dirrm share/doc/tiff/images
@dirrm share/doc/tiff