From fe87125459b1749787753c79053207e497e576ad Mon Sep 17 00:00:00 2001
From: epienbro <epienbro@fedoraproject.org>
Date: Fri, 28 Aug 2009 04:54:50 +0000
Subject: [PATCH] - Rebuild for minw32-libjpeg 7 - Automatically generate
 debuginfo subpackage - Added -static subpackage

---
 libtiff-mingw32-libjpeg-7-compatibility.patch | 62 +++++++++++++++++++
 mingw32-libtiff.spec                          | 37 ++++++++++-
 2 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 libtiff-mingw32-libjpeg-7-compatibility.patch

diff --git a/libtiff-mingw32-libjpeg-7-compatibility.patch b/libtiff-mingw32-libjpeg-7-compatibility.patch
new file mode 100644
index 0000000..4cc6e28
--- /dev/null
+++ b/libtiff-mingw32-libjpeg-7-compatibility.patch
@@ -0,0 +1,62 @@
+--- 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;
diff --git a/mingw32-libtiff.spec b/mingw32-libtiff.spec
index dab74ab..a0bb557 100644
--- a/mingw32-libtiff.spec
+++ b/mingw32-libtiff.spec
@@ -3,11 +3,12 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Summary: MinGW Windows port of the LibTIFF library
 Name: mingw32-libtiff
 Version: 3.8.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: libtiff
 Group: System Environment/Libraries
 URL: http://www.remotesensing.org/libtiff/
@@ -18,6 +19,8 @@ Patch1: libtiff-3.8.2-ormandy.patch
 Patch2: libtiff-3.8.2-CVE-2006-2193.patch
 Patch4: libtiff-3.8.2-lzw-bugs.patch
 
+Patch100: libtiff-mingw32-libjpeg-7-compatibility.patch
+
 BuildArch: noarch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -36,6 +39,19 @@ used file format for bitmapped images.  TIFF files usually end in the
 The libtiff package should be installed if you need to manipulate TIFF
 format image files.
 
+
+%package static
+Summary:        Static version of the MinGW Windows LibTIFF library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows LibTIFF library.
+
+
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n tiff-%{version}
 
@@ -45,11 +61,16 @@ format image files.
 %patch2 -p1 -b .CVE-2006-2193
 %patch4 -p1
 
+# MinGW specific patches
+%patch100 -p0
+
+
 %build
 export MINGW32_CFLAGS="%{_mingw32_cflags} -fno-strict-aliasing"
-%{_mingw32_configure} --disable-static
+%{_mingw32_configure} --enable-static --enable-shared
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install 
@@ -61,9 +82,11 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 # remove binaries
 rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README RELEASE-DATE VERSION TODO ChangeLog
@@ -75,8 +98,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libtiff.la
 %{_mingw32_libdir}/libtiffxx.la
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libtiff.a
+%{_mingw32_libdir}/libtiffxx.a
+
 
 %changelog
+* Thu Aug 27 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 3.8.2-19
+- Rebuild for minw32-libjpeg 7
+- Automatically generate debuginfo subpackage
+- Added -static subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild