packages: crossmingw32-libtiff/crossmingw32-libtiff.spec, crossmingw32-libt...
qboosh
qboosh at pld-linux.org
Mon Dec 26 12:18:49 CET 2011
Author: qboosh Date: Mon Dec 26 11:18:49 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 4.0.0
---- Files affected:
packages/crossmingw32-libtiff:
crossmingw32-libtiff.spec (1.10 -> 1.11) , libtiff-glut.patch (1.1 -> 1.2) , libtiff-sec.patch (1.4 -> 1.5) , libtiff-CVE-2009-2285.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/crossmingw32-libtiff/crossmingw32-libtiff.spec
diff -u packages/crossmingw32-libtiff/crossmingw32-libtiff.spec:1.10 packages/crossmingw32-libtiff/crossmingw32-libtiff.spec:1.11
--- packages/crossmingw32-libtiff/crossmingw32-libtiff.spec:1.10 Thu May 19 21:39:33 2011
+++ packages/crossmingw32-libtiff/crossmingw32-libtiff.spec Mon Dec 26 12:18:43 2011
@@ -1,25 +1,26 @@
# $Revision$, $Date$
+# TODO: jbigkit support
Summary: Library for handling TIFF files - cross MinGW32 version
Summary(pl.UTF-8): Biblioteka do manipulacji plikami w formacie TIFF - wersja skrośna MinGW32
%define realname libtiff
Name: crossmingw32-%{realname}
-Version: 3.9.5
-Release: 2
+Version: 4.0.0
+Release: 1
License: BSD-like
Group: Development/Libraries
-Source0: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-# Source0-md5: 8fc7ce3b4e1d0cc8a319336967815084
-Patch0: %{realname}-sec.patch
-Patch1: %{realname}-glut.patch
-Patch2: %{realname}-CVE-2009-2285.patch
+Source0: http://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
+# Source0-md5: 456ad12e7c492b275a0d047f2ba89904
+Patch0: %{realname}-glut.patch
+Patch1: %{realname}-sec.patch
URL: http://www.remotesensing.org/libtiff/
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11
BuildRequires: crossmingw32-gcc-c++
BuildRequires: crossmingw32-libjpeg
BuildRequires: crossmingw32-zlib
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2
Requires: crossmingw32-libjpeg
+Requires: crossmingw32-xz
Requires: crossmingw32-zlib
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,6 +32,7 @@
%define _sysprefix /usr
%define _prefix %{_sysprefix}/%{target}
%define _libdir %{_prefix}/lib
+%define _pkgconfigdir %{_prefix}/lib/pkgconfig
%define _dlldir /usr/share/wine/windows/system
%define __cc %{target}-gcc
%define __cxx %{target}-g++
@@ -68,6 +70,7 @@
Group: Applications/Emulators
Requires: wine
Requires: crossmingw32-libjpeg-dll
+Requires: crossmingw32-xz-dll
Requires: crossmingw32-zlib-dll
%description dll
@@ -116,10 +119,7 @@
%prep
%setup -q -n tiff-%{version}
%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-
-%{__rm} m4/{libtool,lt*}.m4
+%patch1 -p1
%build
%{__libtoolize}
@@ -148,7 +148,8 @@
%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
%endif
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{doc,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{doc,man}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/*.exe
%clean
rm -rf $RPM_BUILD_ROOT
@@ -159,6 +160,7 @@
%{_libdir}/libtiff.dll.a
%{_libdir}/libtiff.la
%{_includedir}/tiff*.h
+%{_pkgconfigdir}/libtiff-4.pc
%files static
%defattr(644,root,root,755)
@@ -188,6 +190,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2011/12/26 11:18:43 qboosh
+- updated to 4.0.0
+
Revision 1.10 2011/05/19 19:39:33 qboosh
- fixed _dlldir
- release 2
================================================================
Index: packages/crossmingw32-libtiff/libtiff-glut.patch
diff -u packages/crossmingw32-libtiff/libtiff-glut.patch:1.1 packages/crossmingw32-libtiff/libtiff-glut.patch:1.2
--- packages/crossmingw32-libtiff/libtiff-glut.patch:1.1 Sun Mar 21 22:08:45 2010
+++ packages/crossmingw32-libtiff/libtiff-glut.patch Mon Dec 26 12:18:43 2011
@@ -1,22 +1,20 @@
---- m4/acinclude.m4~ 2005-12-06 11:40:01.000000000 +0000
-+++ m4/acinclude.m4 2008-09-05 14:24:05.000000000 +0100
-@@ -391,7 +391,7 @@
- [ax_cv_check_glut_libglut="no"
- ax_save_LIBS="${LIBS}"
- LIBS=""
-- ax_check_libs="-lglut32 -lglut"
-+ ax_check_libs="-lglut"
- for ax_lib in ${ax_check_libs}; do
- if test X$ax_compiler_ms = Xyes; then
- ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`
---- m4/acinclude.m4~ 2008-09-05 17:45:34.000000000 +0100
-+++ m4/acinclude.m4 2008-09-05 17:53:41.000000000 +0100
-@@ -379,7 +379,7 @@
- # If X is present, assume GLUT depends on it.
- #
- if test "X${no_x}" != "Xyes"; then
-- GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"
-+ GLUT_LIBS="${X_PRE_LIBS} ${X_EXTRA_LIBS} ${GLUT_LIBS}"
- fi
+--- tiff-4.0.0/m4/acinclude.m4.orig 2010-07-08 18:10:23.000000000 +0200
++++ tiff-4.0.0/m4/acinclude.m4 2011-12-24 08:14:26.299073546 +0100
+@@ -531,7 +531,7 @@
+ dnl If X is present, assume GLUT depends on it.
+ dnl
+ AS_IF([test X$no_x != Xyes],
+- [GLUT_LIBS="${X_PRE_LIBS} -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"])
++ [GLUT_LIBS="${X_EXTRA_LIBS} ${GLUT_LIBS}"])
- AC_LANG_PUSH(C)
+ AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut],
+ [ax_cv_check_glut_libglut="no"
+@@ -540,7 +540,7 @@
+ CPPFLAGS="${GLUT_CFLAGS} ${CPPFLAGS}"
+ ax_save_LIBS="${LIBS}"
+ LIBS=""
+-ax_check_libs="-lglut32 -lglut"
++ax_check_libs="-lglut"
+ for ax_lib in ${ax_check_libs}; do
+ AS_IF([test X$ax_compiler_ms = Xyes],
+ [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`],
================================================================
Index: packages/crossmingw32-libtiff/libtiff-sec.patch
diff -u packages/crossmingw32-libtiff/libtiff-sec.patch:1.4 packages/crossmingw32-libtiff/libtiff-sec.patch:1.5
--- packages/crossmingw32-libtiff/libtiff-sec.patch:1.4 Sat Apr 23 06:41:54 2011
+++ packages/crossmingw32-libtiff/libtiff-sec.patch Mon Dec 26 12:18:43 2011
@@ -1,211 +1,85 @@
---- tiff-3.9.1/libtiff/tif_dir.c.orig 2009-01-01 01:10:43.000000000 +0100
-+++ tiff-3.9.1/libtiff/tif_dir.c 2009-08-31 17:46:34.892612613 +0200
-@@ -138,6 +138,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va
+--- tiff-4.0.0/libtiff/tif_dir.c.orig 2011-02-19 17:26:09.000000000 +0100
++++ tiff-4.0.0/libtiff/tif_dir.c 2011-12-24 10:43:18.779372638 +0100
+@@ -153,6 +153,7 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va
{
static const char module[] = "_TIFFVSetField";
-+ const TIFFFieldInfo* fip;
++ const TIFFField* fip;
TIFFDirectory* td = &tif->tif_dir;
int status = 1;
uint32 v32, i, v;
-@@ -585,17 +586,19 @@ end:
+@@ -660,17 +661,19 @@ end:
va_end(ap);
return (status);
badvalue:
-+ fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
++ fip = TIFFFieldWithTag(tif, tag);
TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Bad value %d for \"%s\" tag",
+ "%s: Bad value %u for \"%s\" tag",
tif->tif_name, v,
-- _TIFFFieldWithTag(tif, tag)->field_name);
+- TIFFFieldWithTag(tif, tag)->field_name);
+ fip ? fip->field_name : "Unknown");
va_end(ap);
return (0);
badvalue32:
-+ fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
++ fip = TIFFFieldWithTag(tif, tag);
TIFFErrorExt(tif->tif_clientdata, module,
"%s: Bad value %u for \"%s\" tag",
tif->tif_name, v32,
-- _TIFFFieldWithTag(tif, tag)->field_name);
+- TIFFFieldWithTag(tif, tag)->field_name);
+ fip ? fip->field_name : "Unknown");
va_end(ap);
return (0);
}
---- tiff-3.9.1/libtiff/tif_dirread.c.orig 2009-01-01 01:10:43.000000000 +0100
-+++ tiff-3.9.1/libtiff/tif_dirread.c 2009-08-31 18:38:28.060606747 +0200
-@@ -190,6 +190,11 @@ TIFFReadDirectory(TIFF* tif)
- dp->tdir_tag,
- dp->tdir_tag);
-
-+ if (!compressionknown) {
-+ TIFFWarningExt(tif->tif_clientdata, module,
-+ "Ignoring, compression unknown");
-+ goto ignore;
-+ }
- if (!_TIFFMergeFieldInfo(tif,
- _TIFFCreateAnonFieldInfo(tif,
- dp->tdir_tag,
-@@ -583,6 +588,7 @@ TIFFReadDirectory(TIFF* tif)
+--- tiff-4.0.0/libtiff/tif_dirread.c.orig 2011-12-22 00:18:41.000000000 +0100
++++ tiff-4.0.0/libtiff/tif_dirread.c 2011-12-24 10:39:34.932698478 +0100
+@@ -3897,6 +3897,7 @@ TIFFReadDirectory(TIFF* tif)
* Attempt to deal with a missing StripByteCounts tag.
*/
if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
++ const TIFFField* fip = TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
/*
* Some manufacturers violate the spec by not giving
* the size of the strips. In this case, assume there
-@@ -599,7 +605,7 @@ TIFFReadDirectory(TIFF* tif)
- "%s: TIFF directory is missing required "
+@@ -3912,7 +3913,7 @@ TIFFReadDirectory(TIFF* tif)
+ TIFFWarningExt(tif->tif_clientdata, module,
+ "TIFF directory is missing required "
"\"%s\" field, calculating from imagelength",
- tif->tif_name,
-- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+- TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
+ fip ? fip->field_name : "Unknown");
if (EstimateStripByteCounts(tif, dir, dircount) < 0)
goto bad;
/*
-@@ -626,6 +632,7 @@ TIFFReadDirectory(TIFF* tif)
- } else if (td->td_nstrips == 1
- && td->td_stripoffset[0] != 0
+@@ -3940,6 +3941,7 @@ TIFFReadDirectory(TIFF* tif)
+ && _TIFFFillStriles(tif)
+ && tif->tif_dir.td_stripoffset[0] != 0
&& BYTECOUNTLOOKSBAD) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
++ const TIFFField* fip = TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
/*
* XXX: Plexus (and others) sometimes give a value of
* zero for a tag when they don't know what the
-@@ -635,7 +642,7 @@ TIFFReadDirectory(TIFF* tif)
+@@ -3948,7 +3950,7 @@ TIFFReadDirectory(TIFF* tif)
+ */
TIFFWarningExt(tif->tif_clientdata, module,
- "%s: Bogus \"%s\" field, ignoring and calculating from imagelength",
- tif->tif_name,
-- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+ fip ? fip->field_name : "Unknown");
+ "Bogus \"%s\" field, ignoring and calculating from imagelength",
+- TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
++ fip ? fip->field_name : "Unknown");
if(EstimateStripByteCounts(tif, dir, dircount) < 0)
goto bad;
- } else if (td->td_planarconfig == PLANARCONFIG_CONTIG
-@@ -644,6 +651,7 @@ TIFFReadDirectory(TIFF* tif)
- && td->td_stripbytecount[0] != td->td_stripbytecount[1]
- && td->td_stripbytecount[0] != 0
- && td->td_stripbytecount[1] != 0 ) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
+
+@@ -3959,6 +3961,7 @@ TIFFReadDirectory(TIFF* tif)
+ && tif->tif_dir.td_stripbytecount[0] != tif->tif_dir.td_stripbytecount[1]
+ && tif->tif_dir.td_stripbytecount[0] != 0
+ && tif->tif_dir.td_stripbytecount[1] != 0 ) {
++ const TIFFField* fip = TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
/*
- * XXX: Some vendors fill StripByteCount array with
- * absolutely wrong values (it can be equal to
-@@ -653,7 +661,7 @@ TIFFReadDirectory(TIFF* tif)
+ * XXX: Some vendors fill StripByteCount array with
+ * absolutely wrong values (it can be equal to
+@@ -3971,7 +3974,7 @@ TIFFReadDirectory(TIFF* tif)
+ */
TIFFWarningExt(tif->tif_clientdata, module,
- "%s: Wrong \"%s\" field, ignoring and calculating from imagelength",
- tif->tif_name,
-- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+ fip ? fip->field_name : "Unknown");
+ "Wrong \"%s\" field, ignoring and calculating from imagelength",
+- TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
++ fip ? fip->field_name : "Unknown");
if (EstimateStripByteCounts(tif, dir, dircount) < 0)
goto bad;
- }
-@@ -1024,16 +1032,18 @@ TIFFCheckDirOffset(TIFF* tif, toff_t dir
- static int
- CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count)
- {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
-+
- if (count > dir->tdir_count) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "incorrect count for field \"%s\" (%u, expecting %u); tag ignored",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
-+ fip ? fip->field_name : "Unknown",
- dir->tdir_count, count);
- return (0);
- } else if (count < dir->tdir_count) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "incorrect count for field \"%s\" (%u, expecting %u); tag trimmed",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
-+ fip ? fip->field_name : "Unknown",
- dir->tdir_count, count);
- return (1);
- }
-@@ -1153,6 +1163,7 @@ static tsize_t
- TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp)
- {
- uint32 w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
-+ const TIFFFieldInfo* fip;
- /*
- * FIXME: butecount should have tsize_t type, but for now libtiff
- * defines tsize_t as a signed 32-bit integer and we are losing
-@@ -1200,9 +1211,10 @@ TIFFFetchData(TIFF* tif, TIFFDirEntry* d
- }
- return (cc);
- bad:
-+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error fetching data for field \"%s\"",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- return (tsize_t) 0;
- }
-
-@@ -1229,9 +1241,10 @@ static int
- cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv)
- {
- if (denom == 0) {
-+ const TIFFFieldInfo *fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%s: Rational with zero denominator (num = %u)",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num);
-+ fip ? fip->field_name : "Unknown", num);
- return (0);
- } else {
- if (dir->tdir_type == TIFF_RATIONAL)
-@@ -1351,9 +1364,10 @@ TIFFFetchShortPair(TIFF* tif, TIFFDirEnt
- * check on tdir_count, this should never be greater than two.
- */
- if (dir->tdir_count > 2) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "unexpected count for field \"%s\", %u, expected 2; ignored",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
-+ fip ? fip->field_name : "Unknown",
- dir->tdir_count);
- return 0;
- }
-@@ -1529,11 +1543,14 @@ TIFFFetchAnyArray(TIFF* tif, TIFFDirEntr
- /* TIFF_NOTYPE */
- /* TIFF_ASCII */
- /* TIFF_UNDEFINED */
-+ {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "cannot read TIFF_ANY type %d for field \"%s\"",
- dir->tdir_type,
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- return (0);
-+ }
- }
- return (1);
- }
-@@ -1548,6 +1565,8 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEnt
- int ok = 0;
- const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag);
-
-+ if (fip == NULL)
-+ return (0);
- if (dp->tdir_count > 1) { /* array of values */
- char* cp = NULL;
-
-@@ -1707,9 +1726,10 @@ TIFFFetchPerSampleShorts(TIFF* tif, TIFF
-
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
-+ const TIFFFieldInfo *fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- goto bad;
- }
- *pl = v[0];
-@@ -1748,9 +1768,10 @@ TIFFFetchPerSampleLongs(TIFF* tif, TIFFD
- check_count = samples;
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
-+ const TIFFFieldInfo *fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- goto bad;
- }
- *pl = v[0];
+ #endif /* !defined(DEFER_STRILE_LOAD) */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-libtiff/crossmingw32-libtiff.spec?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-libtiff/libtiff-glut.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-libtiff/libtiff-sec.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list