Mercurial > mxe-octave

changeset 983:464f5f2cba21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package jpeg Previously used patch is now in sources from upstream.
author Mark Brand <mabrand@mabrand.nl>
date Sun, 16 May 2010 20:02:59 +0200
parents 4d2e6c7c2cc2
children 635b50ea7d26
files src/jpeg-1-win32.patch src/jpeg.mk
diffstat 2 files changed, 2 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/src/jpeg-1-win32.patch	Sun May 16 18:06:17 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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,
--- a/src/jpeg.mk	Sun May 16 18:06:17 2010 +0200
+++ b/src/jpeg.mk	Sun May 16 20:02:59 2010 +0200
@@ -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/