diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-04-27 16:38:53 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-04-27 16:38:53 (GMT) |
| commit | 9d4ad484dac884df614bff57835ea882896ffe24 (patch) | |
| tree | 128ddaeb84e5e04b0f9eab285a4528e79764247a /src | |
| parent | ad2ba4c404135bc2b17e91588ea5bb6e34a51f13 (diff) | |
| download | mxe-9d4ad484dac884df614bff57835ea882896ffe24.zip mxe-9d4ad484dac884df614bff57835ea882896ffe24.tar.gz mxe-9d4ad484dac884df614bff57835ea882896ffe24.tar.bz2 | |
improved patch for package jpeg
Diffstat (limited to 'src')
| -rw-r--r-- | src/jpeg-win32.patch | 51 | ||||
| -rw-r--r-- | src/libpano13-fix-jpeg-win32.patch | 12 |
2 files changed, 40 insertions, 23 deletions
diff --git a/src/jpeg-win32.patch b/src/jpeg-win32.patch index 6224ccd..8ef1d99 100644 --- a/src/jpeg-win32.patch +++ b/src/jpeg-win32.patch @@ -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. - */ -+ -+ -+/* -+ * Load standard definitions on Windows systems to ensure that these -+ * are defined when _building_ as well as _using_ the library. -+ */ +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 + ++/* 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 - /* -@@ -233,7 +243,11 @@ +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 - #ifndef HAVE_BOOLEAN -+#ifndef _RPCNDR_H_ /* Microsoft defines it in rpcndr.h */ -+#ifndef _RPCNDR_H /* MinGW is slightly different */ - typedef int boolean; ++/* 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 - #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, diff --git a/src/libpano13-fix-jpeg-win32.patch b/src/libpano13-fix-jpeg-win32.patch new file mode 100644 index 0000000..bea9f15 --- /dev/null +++ b/src/libpano13-fix-jpeg-win32.patch @@ -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" |