diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-05-16 18:02:59 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-05-16 18:02:59 (GMT) |
| commit | d48ac3e3bc58f75fdf373fae994e265035ec9157 (patch) | |
| tree | ec6d6ebf2cb17e99d6d413c4033890aa60a76d57 | |
| parent | 335a9b234263af534ba8c1330528d9db823c8da2 (diff) | |
| download | mxe-d48ac3e3bc58f75fdf373fae994e265035ec9157.zip mxe-d48ac3e3bc58f75fdf373fae994e265035ec9157.tar.gz mxe-d48ac3e3bc58f75fdf373fae994e265035ec9157.tar.bz2 | |
update package jpeg
Previously used patch is now in sources from upstream.
| -rw-r--r-- | src/jpeg-1-win32.patch | 40 | ||||
| -rw-r--r-- | src/jpeg.mk | 4 |
2 files changed, 2 insertions, 42 deletions
diff --git a/src/jpeg-1-win32.patch b/src/jpeg-1-win32.patch deleted file mode 100644 index 8ef1d99..0000000 --- a/src/jpeg-1-win32.patch +++ /dev/null @@ -1,40 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -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 -+#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 -+ - - /* - * The following options affect code selection within the JPEG library, diff --git a/src/jpeg.mk b/src/jpeg.mk index acfbbed..9eb7253 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -4,8 +4,8 @@ # jpeg PKG := jpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 8a -$(PKG)_CHECKSUM := 78077fb22f0b526a506c21199fbca941d5c671a9 +$(PKG)_VERSION := 8b +$(PKG)_CHECKSUM := 15dc1939ea1a5b9d09baea11cceb13ca59e4f9df $(PKG)_SUBDIR := jpeg-$($(PKG)_VERSION) $(PKG)_FILE := jpegsrc.v$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.ijg.org/ |