From ce058df158ea761548d0e88578e22ca642b6066d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 3 Jun 2011 23:27:14 +0300 Subject: [PATCH] Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702) --- libtiff-mingw32-libjpeg-7-compatibility.patch | 94 ------------------- mingw32-libtiff.spec | 10 +- 2 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 libtiff-mingw32-libjpeg-7-compatibility.patch diff --git a/libtiff-mingw32-libjpeg-7-compatibility.patch b/libtiff-mingw32-libjpeg-7-compatibility.patch deleted file mode 100644 index 9ecb365..0000000 --- a/libtiff-mingw32-libjpeg-7-compatibility.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- libtiff/tif_jpeg.c.orig 2009-08-20 14:27:50.688881034 +0200 -+++ libtiff/tif_jpeg.c 2009-08-20 14:29:03.814866414 +0200 -@@ -288,20 +288,20 @@ - } - - static int --TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline) -+TIFFjpeg_set_quality(JPEGState* sp, int quality, jpeg_boolean force_baseline) - { - return CALLVJPEG(sp, - jpeg_set_quality(&sp->cinfo.c, quality, force_baseline)); - } - - static int --TIFFjpeg_suppress_tables(JPEGState* sp, boolean suppress) -+TIFFjpeg_suppress_tables(JPEGState* sp, jpeg_boolean suppress) - { - return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress)); - } - - static int --TIFFjpeg_start_compress(JPEGState* sp, boolean write_all_tables) -+TIFFjpeg_start_compress(JPEGState* sp, jpeg_boolean write_all_tables) - { - return CALLVJPEG(sp, - jpeg_start_compress(&sp->cinfo.c, write_all_tables)); -@@ -334,7 +334,7 @@ - } - - static int --TIFFjpeg_read_header(JPEGState* sp, boolean require_image) -+TIFFjpeg_read_header(JPEGState* sp, jpeg_boolean require_image) - { - return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image)); - } -@@ -402,7 +402,7 @@ - sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize; - } - --static boolean -+static jpeg_boolean - std_empty_output_buffer(j_compress_ptr cinfo) - { - JPEGState* sp = (JPEGState*) cinfo; -@@ -453,7 +453,7 @@ - sp->dest.free_in_buffer = (size_t) sp->jpegtables_length; - } - --static boolean -+static jpeg_boolean - tables_empty_output_buffer(j_compress_ptr cinfo) - { - JPEGState* sp = (JPEGState*) cinfo; -@@ -519,7 +519,7 @@ - sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc; - } - --static boolean -+static jpeg_boolean - std_fill_input_buffer(j_decompress_ptr cinfo) - { - JPEGState* sp = (JPEGState* ) cinfo; ---- libtiff/tif_ojpeg.c.orig 2010-06-25 14:42:58.387654713 +0200 -+++ libtiff/tif_ojpeg.c 2010-06-25 14:43:24.483651879 +0200 -@@ -383,9 +383,9 @@ - static void OJPEGLibjpegJpegErrorMgrOutputMessage(jpeg_common_struct* cinfo); - static void OJPEGLibjpegJpegErrorMgrErrorExit(jpeg_common_struct* cinfo); - static void OJPEGLibjpegJpegSourceMgrInitSource(jpeg_decompress_struct* cinfo); --static boolean OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo); -+static jpeg_boolean OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo); - static void OJPEGLibjpegJpegSourceMgrSkipInputData(jpeg_decompress_struct* cinfo, long num_bytes); --static boolean OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired); -+static jpeg_boolean OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired); - static void OJPEGLibjpegJpegSourceMgrTermSource(jpeg_decompress_struct* cinfo); - - int -@@ -2388,7 +2388,7 @@ - (void)cinfo; - } - --static boolean -+static jpeg_boolean - OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo) - { - TIFF* tif=(TIFF*)cinfo->client_data; -@@ -2414,7 +2414,7 @@ - jpeg_encap_unwind(tif); - } - --static boolean -+static jpeg_boolean - OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired) - { - TIFF* tif=(TIFF*)cinfo->client_data; diff --git a/mingw32-libtiff.spec b/mingw32-libtiff.spec index 8637a08..3e0f2c4 100644 --- a/mingw32-libtiff.spec +++ b/mingw32-libtiff.spec @@ -8,15 +8,13 @@ Summary: MinGW Windows port of the LibTIFF library Name: mingw32-libtiff Version: 3.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: libtiff Group: System Environment/Libraries URL: http://www.remotesensing.org/libtiff/ Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz -Patch100: libtiff-mingw32-libjpeg-7-compatibility.patch - BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -55,9 +53,6 @@ Static version of the MinGW Windows LibTIFF library. %prep %setup -q -n tiff-%{version} -# MinGW specific patches -%patch100 -p0 - # Use build system's libtool.m4, not the one in the package. rm -f libtool.m4 @@ -108,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 03 2011 Kalev Lember - 3.9.5-2 +- Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702) + * Mon Apr 25 2011 Kalev Lember - 3.9.5-1 - Update to 3.9.5 - Fixes CVE-2011-1167 (#689575)