--- a/src/jpeg-win32.patch	Tue Apr 27 17:51:21 2010 +0200
+++ b/src/jpeg-win32.patch	Tue Apr 27 18:38:53 2010 +0200
@@ -1,35 +1,40 @@
 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
-diff -r 13edd7b348d4 jmorecfg.h
---- a/jmorecfg.h	Wed Apr 21 10:15:34 2010 +0200
-+++ b/jmorecfg.h	Wed Apr 21 11:36:07 2010 +0200
-@@ -10,6 +10,16 @@
-  * JPEG software for special applications or support machine-dependent
-  * optimizations.  Most users will not need to touch this file.
-  */
+diff -r fcac1fe04220 jconfig.cfg
+--- a/jconfig.cfg	Sun Apr 25 11:28:20 2010 +0200
++++ b/jconfig.cfg	Mon Apr 26 11:32:32 2010 +0200
+@@ -16,6 +16,14 @@
+ #undef NEED_SHORT_EXTERNAL_NAMES
+ /* Define this if you get warnings about undefined structures. */
+ #undef INCOMPLETE_TYPES_BROKEN
 +
-+
-+/*
-+ * Load standard definitions on Windows systems to ensure that these
-+ * are defined when _building_ as well as _using_ the library.
-+ */
-+
++/* Define "boolean" as unsigned char, not int, on Windows systems. */
 +#ifdef _WIN32
-+#include <windows.h>
++#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
++typedef unsigned char boolean;
++#endif
++#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
 +#endif
  
+ #ifdef JPEG_INTERNALS
+ 
+diff -r fcac1fe04220 jconfig.txt
+--- a/jconfig.txt	Sun Apr 25 11:28:20 2010 +0200
++++ b/jconfig.txt	Mon Apr 26 11:32:32 2010 +0200
+@@ -91,6 +91,15 @@
+  */
+ #undef INCOMPLETE_TYPES_BROKEN
+ 
++/* Define "boolean" as unsigned char, not int, on Windows systems.
++ */
++#ifdef _WIN32
++#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
++typedef unsigned char boolean;
++#endif
++#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
++#endif
++
  
  /*
-@@ -233,7 +243,11 @@
-  */
- 
- #ifndef HAVE_BOOLEAN
-+#ifndef _RPCNDR_H_		/* Microsoft defines it in rpcndr.h */
-+#ifndef _RPCNDR_H		/* MinGW is slightly different */
- typedef int boolean;
-+#endif
-+#endif
- #endif
- #ifndef FALSE			/* in case these macros already exist */
- #define FALSE	0		/* values of boolean */
+  * The following options affect code selection within the JPEG library,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libpano13-fix-jpeg-win32.patch	Tue Apr 27 18:38:53 2010 +0200
@@ -0,0 +1,12 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -r f39a7d5630f2 jpeg.c
+--- a/jpeg.c	Tue Apr 27 18:26:40 2010 +0200
++++ b/jpeg.c	Tue Apr 27 18:27:05 2010 +0200
+@@ -1,5 +1,4 @@
+ #include <stdio.h>
+-#include <jpeglib.h>
+ //#define __NO_SYSTEM__
+ #include "filter.h"
+ #include "metadata.h"