cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 4.0.10.

Browse Source 
Disable the new support for ZSTD and WebP compression for the time being
to avoid bringing in extra dependencies.
This commit is contained in:
naddy 2018-12-05 20:35:25 +00:00
parent 33bea57aa6
commit b3b70c47ec
12 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/tiff/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.86 2018/10/24 14:28:06 sthen Exp $
# $OpenBSD: Makefile,v 1.87 2018/12/05 20:35:25 naddy Exp $
COMMENT= tools and library routines for working with TIFF images
DISTNAME= tiff-4.0.9
SHARED_LIBS= tiff 40.2 # 7.6
SHARED_LIBS+= tiffxx 40.1 # 7.6
DISTNAME= tiff-4.0.10
SHARED_LIBS= tiff 40.3 # 9.0
SHARED_LIBS+= tiffxx 40.2 # 9.0
CATEGORIES= graphics
REVISION= 0
MASTER_SITES= http://download.osgeo.org/libtiff/
@ -23,6 +22,8 @@ PERMIT_PACKAGE_CDROM= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-jbig \
--disable-lzma \
--disable-webp \
--disable-zstd \
--with-docdir="${PREFIX}/share/doc/tiff" \
--with-jpeg-include-dir="${LOCALBASE}/include" \
--with-jpeg-lib-dir="${LOCALBASE}/lib" \

4
graphics/tiff/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tiff-4.0.9.tar.gz) = bnve7CwxBzTnNNGarjpx6+N6TYQuDiPbsbiSHAAmz80=
SIZE (tiff-4.0.9.tar.gz) = 2305681
SHA256 (tiff-4.0.10.tar.gz) = LFLRHMr3Z0V9sMRnldnH0ajY929osLgAo9/kV4a5luQ=
SIZE (tiff-4.0.10.tar.gz) = 2402867

9
graphics/tiff/patches/patch-Makefile_in
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.12 2016/11/29 20:00:35 naddy Exp $
--- Makefile.in.orig Sat Nov 19 18:40:20 2016
+++ Makefile.in Thu Nov 24 21:44:23 2016
@@ -436,7 +436,7 @@ EXTRA_DIST = \
$OpenBSD: patch-Makefile_in,v 1.13 2018/12/05 20:35:25 naddy Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -433,7 +433,7 @@ EXTRA_DIST = \
nmake.opt
dist_doc_DATA = $(docfiles)

9
graphics/tiff/patches/patch-libtiff_Makefile_in
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-libtiff_Makefile_in,v 1.16 2015/11/04 20:51:36 naddy Exp $
$OpenBSD: patch-libtiff_Makefile_in,v 1.17 2018/12/05 20:35:25 naddy Exp $
* Avoid picking up an old libtiff in ${LOCALBASE}.
--- libtiff/Makefile.in.orig Sat Sep 12 21:48:44 2015
+++ libtiff/Makefile.in Wed Nov 4 17:33:52 2015
@@ -345,10 +345,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
Index: libtiff/Makefile.in
--- libtiff/Makefile.in.orig
+++ libtiff/Makefile.in
@@ -368,10 +368,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@

9
graphics/tiff/patches/patch-libtiff_tif_codec_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-libtiff_tif_codec_c,v 1.5 2015/11/04 20:51:36 naddy Exp $
--- libtiff/tif_codec.c.orig Sat Aug 29 00:16:22 2015
+++ libtiff/tif_codec.c Wed Nov 4 17:37:49 2015
@@ -108,7 +108,8 @@ _notConfigured(TIFF* tif)
$OpenBSD: patch-libtiff_tif_codec_c,v 1.6 2018/12/05 20:35:25 naddy Exp $
Index: libtiff/tif_codec.c
--- libtiff/tif_codec.c.orig
+++ libtiff/tif_codec.c
@@ -114,7 +114,8 @@ _notConfigured(TIFF* tif)
const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
char compression_code[20];

9
graphics/tiff/patches/patch-libtiff_tif_compress_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-libtiff_tif_compress_c,v 1.4 2012/04/14 15:09:55 naddy Exp $
--- libtiff/tif_compress.c.orig Wed Apr 11 18:23:56 2012
+++ libtiff/tif_compress.c Wed Apr 11 18:25:07 2012
@@ -201,14 +201,15 @@ TIFFFindCODEC(uint16 scheme)
$OpenBSD: patch-libtiff_tif_compress_c,v 1.5 2018/12/05 20:35:25 naddy Exp $
Index: libtiff/tif_compress.c
--- libtiff/tif_compress.c.orig
+++ libtiff/tif_compress.c
@@ -199,14 +199,15 @@ TIFFFindCODEC(uint16 scheme)
TIFFCodec*
TIFFRegisterCODEC(uint16 scheme, const char* name, TIFFInitMethod init)
{

11
graphics/tiff/patches/patch-libtiff_tif_extension_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-libtiff_tif_extension_c,v 1.5 2016/11/29 20:00:35 naddy Exp $
--- libtiff/tif_extension.c.orig Wed Apr 11 18:27:24 2012
+++ libtiff/tif_extension.c Wed Apr 11 18:28:53 2012
@@ -81,6 +81,7 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const c
$OpenBSD: patch-libtiff_tif_extension_c,v 1.6 2018/12/05 20:35:25 naddy Exp $
Index: libtiff/tif_extension.c
--- libtiff/tif_extension.c.orig
+++ libtiff/tif_extension.c
@@ -79,6 +79,7 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const c
{
TIFFClientInfoLink *psLink = tif->tif_clientinfo;
@ -9,7 +10,7 @@ $OpenBSD: patch-libtiff_tif_extension_c,v 1.5 2016/11/29 20:00:35 naddy Exp $
/*
** Do we have an existing link with this name? If so, just
@@ -102,9 +103,9 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const c
@@ -100,9 +101,9 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const c
psLink = (TIFFClientInfoLink *) _TIFFmalloc(sizeof(TIFFClientInfoLink));
assert (psLink != NULL);
psLink->next = tif->tif_clientinfo;

44
graphics/tiff/patches/patch-libtiff_tif_getimage_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-libtiff_tif_getimage_c,v 1.12 2017/05/26 20:50:57 naddy Exp $
$OpenBSD: patch-libtiff_tif_getimage_c,v 1.13 2018/12/05 20:35:25 naddy Exp $
This one is slightly problematic. If an application allocates less
room for its error buffer than the recommended 1024, the error message
@ -7,7 +7,7 @@ buffer will still overflow.
Index: libtiff/tif_getimage.c
--- libtiff/tif_getimage.c.orig
+++ libtiff/tif_getimage.c
@@ -80,7 +80,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -78,7 +78,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
int colorchannels;
if (!tif->tif_decodestatus) {
@ -16,7 +16,7 @@ Index: libtiff/tif_getimage.c
return (0);
}
switch (td->td_bitspersample) {
@@ -91,12 +91,12 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -89,12 +89,12 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
case 16:
break;
default:
@ -31,7 +31,7 @@ Index: libtiff/tif_getimage.c
return (0);
}
colorchannels = td->td_samplesperpixel - td->td_extrasamples;
@@ -109,7 +109,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -107,7 +107,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
photometric = PHOTOMETRIC_RGB;
break;
default:
@ -40,7 +40,7 @@ Index: libtiff/tif_getimage.c
return (0);
}
}
@@ -120,7 +120,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -118,7 +118,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
if (td->td_planarconfig == PLANARCONFIG_CONTIG
&& td->td_samplesperpixel != 1
&& td->td_bitspersample < 8 ) {
@ -49,7 +49,7 @@ Index: libtiff/tif_getimage.c
"Sorry, can not handle contiguous data with %s=%d, "
"and %s=%d and Bits/Sample=%d",
photoTag, photometric,
@@ -144,7 +144,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -142,7 +142,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
break;
case PHOTOMETRIC_RGB:
if (colorchannels < 3) {
@ -58,7 +58,7 @@ Index: libtiff/tif_getimage.c
"Color channels", colorchannels);
return (0);
}
@@ -154,13 +154,13 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -152,13 +152,13 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
uint16 inkset;
TIFFGetFieldDefaulted(tif, TIFFTAG_INKSET, &inkset);
if (inkset != INKSET_CMYK) {
@ -74,7 +74,7 @@ Index: libtiff/tif_getimage.c
"Sorry, can not handle separated image with %s=%d",
"Samples/pixel", td->td_samplesperpixel);
return 0;
@@ -169,7 +169,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -167,7 +167,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
}
case PHOTOMETRIC_LOGL:
if (td->td_compression != COMPRESSION_SGILOG) {
@ -83,7 +83,7 @@ Index: libtiff/tif_getimage.c
"Compression", COMPRESSION_SGILOG);
return (0);
}
@@ -177,17 +177,17 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -175,17 +175,17 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
case PHOTOMETRIC_LOGLUV:
if (td->td_compression != COMPRESSION_SGILOG &&
td->td_compression != COMPRESSION_SGILOG24) {
@ -104,7 +104,7 @@ Index: libtiff/tif_getimage.c
"Sorry, can not handle image with %s=%d, %s=%d",
"Samples/pixel", td->td_samplesperpixel,
"colorchannels", colorchannels);
@@ -196,7 +196,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -194,7 +194,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
break;
case PHOTOMETRIC_CIELAB:
if ( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 ) {
@ -113,7 +113,7 @@ Index: libtiff/tif_getimage.c
"Sorry, can not handle image with %s=%d, %s=%d and %s=%d",
"Samples/pixel", td->td_samplesperpixel,
"colorchannels", colorchannels,
@@ -205,7 +205,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
@@ -203,7 +203,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
}
break;
default:
@ -122,7 +122,7 @@ Index: libtiff/tif_getimage.c
photoTag, photometric);
return (0);
}
@@ -303,7 +303,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -301,7 +301,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
case 16:
break;
default:
@ -131,7 +131,7 @@ Index: libtiff/tif_getimage.c
img->bitspersample);
goto fail_return;
}
@@ -353,7 +353,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -351,7 +351,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
img->photometric = PHOTOMETRIC_RGB;
break;
default:
@ -140,7 +140,7 @@ Index: libtiff/tif_getimage.c
goto fail_return;
}
}
@@ -361,7 +361,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -359,7 +359,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
case PHOTOMETRIC_PALETTE:
if (!TIFFGetField(tif, TIFFTAG_COLORMAP,
&red_orig, &green_orig, &blue_orig)) {
@ -149,7 +149,7 @@ Index: libtiff/tif_getimage.c
goto fail_return;
}
@@ -371,7 +371,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -369,7 +369,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
img->greencmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
img->bluecmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
if( !img->redcmap || !img->greencmap || !img->bluecmap ) {
@ -158,7 +158,7 @@ Index: libtiff/tif_getimage.c
goto fail_return;
}
@@ -385,7 +385,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -383,7 +383,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
if (planarconfig == PLANARCONFIG_CONTIG
&& img->samplesperpixel != 1
&& img->bitspersample < 8 ) {
@ -167,7 +167,7 @@ Index: libtiff/tif_getimage.c
"Sorry, can not handle contiguous data with %s=%d, "
"and %s=%d and Bits/Sample=%d",
photoTag, img->photometric,
@@ -422,7 +422,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -420,7 +420,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
break;
case PHOTOMETRIC_RGB:
if (colorchannels < 3) {
@ -176,7 +176,7 @@ Index: libtiff/tif_getimage.c
"Color channels", colorchannels);
goto fail_return;
}
@@ -432,12 +432,12 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -430,12 +430,12 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
uint16 inkset;
TIFFGetFieldDefaulted(tif, TIFFTAG_INKSET, &inkset);
if (inkset != INKSET_CMYK) {
@ -191,7 +191,7 @@ Index: libtiff/tif_getimage.c
"Samples/pixel", img->samplesperpixel);
goto fail_return;
}
@@ -445,7 +445,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -443,7 +443,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
break;
case PHOTOMETRIC_LOGL:
if (compress != COMPRESSION_SGILOG) {
@ -200,7 +200,7 @@ Index: libtiff/tif_getimage.c
"Compression", COMPRESSION_SGILOG);
goto fail_return;
}
@@ -455,12 +455,12 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -453,12 +453,12 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
break;
case PHOTOMETRIC_LOGLUV:
if (compress != COMPRESSION_SGILOG && compress != COMPRESSION_SGILOG24) {
@ -215,7 +215,7 @@ Index: libtiff/tif_getimage.c
"Planarconfiguration", planarconfig);
return (0);
}
@@ -471,7 +471,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -469,7 +469,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
case PHOTOMETRIC_CIELAB:
break;
default:
@ -224,7 +224,7 @@ Index: libtiff/tif_getimage.c
photoTag, img->photometric);
goto fail_return;
}
@@ -482,12 +482,12 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
@@ -480,12 +480,12 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int
!(planarconfig == PLANARCONFIG_SEPARATE && img->samplesperpixel > 1);
if (img->isContig) {
if (!PickContigCase(img)) {

11
graphics/tiff/patches/patch-libtiff_tif_open_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-libtiff_tif_open_c,v 1.2 2012/04/14 15:09:55 naddy Exp $
--- libtiff/tif_open.c.orig Wed Apr 11 18:54:12 2012
+++ libtiff/tif_open.c Wed Apr 11 18:55:56 2012
@@ -86,6 +86,7 @@ TIFFClientOpen(
$OpenBSD: patch-libtiff_tif_open_c,v 1.3 2018/12/05 20:35:25 naddy Exp $
Index: libtiff/tif_open.c
--- libtiff/tif_open.c.orig
+++ libtiff/tif_open.c
@@ -84,6 +84,7 @@ TIFFClientOpen(
TIFF *tif;
int m;
const char* cp;
@ -9,7 +10,7 @@ $OpenBSD: patch-libtiff_tif_open_c,v 1.2 2012/04/14 15:09:55 naddy Exp $
/* The following are configuration checks. They should be redundant, but should not
* compile to any actual code in an optimised release build anyway. If any of them
@@ -116,14 +117,15 @@ TIFFClientOpen(
@@ -114,14 +115,15 @@ TIFFClientOpen(
m = _TIFFgetMode(mode, module);
if (m == -1)
goto bad2;

4
graphics/tiff/patches/patch-test_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-test_Makefile_in,v 1.10 2017/11/24 11:23:50 landry Exp $
$OpenBSD: patch-test_Makefile_in,v 1.11 2018/12/05 20:35:25 naddy Exp $
Avoid picking up an old libtiff in ${LOCALBASE}.
Index: test/Makefile.in
--- test/Makefile.in.orig
+++ test/Makefile.in
@@ -526,10 +526,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -532,10 +532,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@

9
graphics/tiff/patches/patch-tools_Makefile_in
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-tools_Makefile_in,v 1.12 2016/11/29 20:00:35 naddy Exp $
$OpenBSD: patch-tools_Makefile_in,v 1.13 2018/12/05 20:35:25 naddy Exp $
Avoid picking up an old libtiff in ${LOCALBASE}.
--- tools/Makefile.in.orig Sat Nov 19 18:40:22 2016
+++ tools/Makefile.in Thu Nov 24 21:44:23 2016
@@ -332,10 +332,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
Index: tools/Makefile.in
--- tools/Makefile.in.orig
+++ tools/Makefile.in
@@ -342,10 +342,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@

6
graphics/tiff/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2017/11/24 11:23:50 landry Exp $
@comment $OpenBSD: PLIST,v 1.27 2018/12/05 20:35:25 naddy Exp $
@bin bin/fax2ps
@bin bin/fax2tiff
@bin bin/pal2rgb
@ -95,8 +95,7 @@ lib/pkgconfig/libtiff-4.pc
share/doc/tiff/
share/doc/tiff/COPYRIGHT
share/doc/tiff/ChangeLog
share/doc/tiff/README
share/doc/tiff/README.vms
share/doc/tiff/README.md
share/doc/tiff/RELEASE-DATE
share/doc/tiff/TIFFTechNote2.html
share/doc/tiff/TODO
@ -233,6 +232,7 @@ share/doc/tiff/v3.9.1.html
share/doc/tiff/v3.9.2.html
share/doc/tiff/v4.0.0.html
share/doc/tiff/v4.0.1.html
share/doc/tiff/v4.0.10.html
share/doc/tiff/v4.0.2.html
share/doc/tiff/v4.0.3.html
share/doc/tiff/v4.0.4.html