Mercurial > mxe-octave

changeset 2220:0e591a7a7d79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update packages sdl sdl_image sdl_mixer sdl_net
author Martin Gerhardy <martin.gerhardy@gmail.com>
date Wed, 25 Jan 2012 22:46:08 +0100
parents 40fbd439a4df
children f4f2f11b6eb0
files src/sdl-1-remove-nonamelessunion.patch src/sdl-2-fix-dinput.patch src/sdl.mk src/sdl_image-1-png.patch src/sdl_image.mk src/sdl_mixer.mk src/sdl_net.mk
diffstat 7 files changed, 9 insertions(+), 167 deletions(-) [+]
line wrap: on
line diff
--- a/src/sdl-1-remove-nonamelessunion.patch	Wed Jan 25 09:37:16 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -r be6033c09175 src/video/windx5/directx.h
---- a/src/video/windx5/directx.h	Fri Apr 23 18:34:51 2010 +0200
-+++ b/src/video/windx5/directx.h	Fri Apr 23 18:42:08 2010 +0200
-@@ -74,9 +74,6 @@
- #define DIRECTSOUND_VERSION 0x0500
- #define DIRECTINPUT_VERSION 0x0700
- 
--#ifdef __GNUC__
--#define NONAMELESSUNION
--#endif
- #include <ddraw.h>
- #include <dsound.h>
- #include <dinput.h>
--- a/src/sdl-2-fix-dinput.patch	Wed Jan 25 09:37:16 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://hg.libsdl.org/SDL/rev/daf9e6037596
-
-diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c
---- a/src/video/windx5/SDL_dx5events.c
-+++ b/src/video/windx5/SDL_dx5events.c
-@@ -559,13 +559,15 @@
- 
- 			active = (wParam && (GetForegroundWindow() == hwnd));
- 			if ( active ) {
--				for ( i=0; SDL_DIdev[i]; ++i ) {
--					IDirectInputDevice2_Acquire(
-+				for ( i=0; i<MAX_INPUTS; ++i ) {
-+					if (SDL_DIdev[i] != NULL)
-+						IDirectInputDevice2_Acquire(
- 								SDL_DIdev[i]);
- 				}
- 			} else {
--				for ( i=0; SDL_DIdev[i]; ++i ) {
--					IDirectInputDevice2_Unacquire(
-+				for ( i=0; i<MAX_INPUTS; ++i ) {
-+					if (SDL_DIdev[i] != NULL) 
-+						IDirectInputDevice2_Unacquire(
- 								SDL_DIdev[i]);
- 				}
- 				mouse_lost = 1;
-
--- a/src/sdl.mk	Wed Jan 25 09:37:16 2012 +0100
+++ b/src/sdl.mk	Wed Jan 25 22:46:08 2012 +0100
@@ -4,8 +4,8 @@
 # SDL
 PKG             := sdl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.14
-$(PKG)_CHECKSUM := ba625b4b404589b97e92d7acd165992debe576dd
+$(PKG)_VERSION  := 1.2.15
+$(PKG)_CHECKSUM := 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
 $(PKG)_SUBDIR   := SDL-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.libsdl.org/
--- a/src/sdl_image-1-png.patch	Wed Jan 25 09:37:16 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://lists.libsdl.org/pipermail/sdl-libsdl.org/2011-March/079946.html
-
-diff --git a/IMG_png.c b/IMG_png.c
-index a79fb9c..67af463 100644
---- a/IMG_png.c
-+++ b/IMG_png.c
-@@ -80,8 +80,13 @@ static struct {
- 	void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr);
- 	png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method);
- 	png_voidp (*png_get_io_ptr) (png_structp png_ptr);
-+#if (PNG_LIBPNG_VER < 10500)
- 	png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
- 	png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag);
-+#else
-+	png_uint_32 (*png_get_tRNS) (png_const_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
-+	png_uint_32 (*png_get_valid) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 flag);
-+#endif
- 	void (*png_read_image) (png_structp png_ptr, png_bytepp image);
- 	void (*png_read_info) (png_structp png_ptr, png_infop info_ptr);
- 	void (*png_read_update_info) (png_structp png_ptr, png_infop info_ptr);
-@@ -90,7 +95,11 @@ static struct {
- 	void (*png_set_packing) (png_structp png_ptr);
- 	void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn);
- 	void (*png_set_strip_16) (png_structp png_ptr);
-+#if (PNG_LIBPNG_VER < 10500)
- 	int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check);
-+#else
-+	int (*png_sig_cmp) (png_const_bytep sig, png_size_t start, png_size_t num_to_check);
-+#endif
- } lib;
- 
- #ifdef LOAD_PNG_DYNAMIC
-@@ -347,7 +356,11 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
-+#if (PNG_LIBPNG_VER < 10500)
- 	if ( setjmp(png_ptr->jmpbuf) ) {
-+#else
-+	if ( setjmp (png_jmpbuf(png_ptr)) ) {
-+#endif
- 		error = "Error reading the PNG file.";
- 		goto done;
- 	}
-@@ -416,9 +429,17 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
-+#if (PNG_LIBPNG_VER < 10500)
- 			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+#else
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
-+#endif
- 		} else {
-+#if (PNG_LIBPNG_VER < 10500)
- 		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+#else
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
-+#endif
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -426,7 +447,11 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
-+#if (PNG_LIBPNG_VER < 10500)
- 			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+#else
-+			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
-+#endif
- 	if ( surface == NULL ) {
- 		error = "Out of memory";
- 		goto done;
-@@ -466,6 +491,11 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
- 
- 	/* Load the palette, if any */
- 	palette = surface->format->palette;
-+#if (PNG_LIBPNG_VER >= 10500)
-+	png_colorp info_palette = 0;
-+	int info_num_palette = 0;
-+	png_get_PLTE(png_ptr, info_ptr, &info_palette, &info_num_palette);
-+#endif
- 	if ( palette ) {
- 	    if(color_type == PNG_COLOR_TYPE_GRAY) {
- 		palette->ncolors = 256;
-@@ -474,12 +504,21 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
-+#if (PNG_LIBPNG_VER < 10500)
- 	    } else if (info_ptr->num_palette > 0 ) {
- 		palette->ncolors = info_ptr->num_palette; 
- 		for( i=0; i<info_ptr->num_palette; ++i ) {
- 		    palette->colors[i].b = info_ptr->palette[i].blue;
- 		    palette->colors[i].g = info_ptr->palette[i].green;
- 		    palette->colors[i].r = info_ptr->palette[i].red;
-+#else
-+	    } else if (info_num_palette > 0 ) {
-+		palette->ncolors = info_num_palette;
-+		for( i=0; i<info_num_palette; ++i ) {
-+		    palette->colors[i].b = info_palette[i].blue;
-+		    palette->colors[i].g = info_palette[i].green;
-+		    palette->colors[i].r = info_palette[i].red;
-+#endif
- 		}
- 	    }
- 	}
--- a/src/sdl_image.mk	Wed Jan 25 09:37:16 2012 +0100
+++ b/src/sdl_image.mk	Wed Jan 25 22:46:08 2012 +0100
@@ -4,8 +4,8 @@
 # SDL_image
 PKG             := sdl_image
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.10
-$(PKG)_CHECKSUM := 6bae71fdfd795c3dbf39f6c7c0cf8b212914ef97
+$(PKG)_VERSION  := 1.2.12
+$(PKG)_CHECKSUM := 5e3e393d4e366638048bbb10d6a269ea3f4e4cf2
 $(PKG)_SUBDIR   := SDL_image-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL_image-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.libsdl.org/projects/SDL_image/
--- a/src/sdl_mixer.mk	Wed Jan 25 09:37:16 2012 +0100
+++ b/src/sdl_mixer.mk	Wed Jan 25 22:46:08 2012 +0100
@@ -4,8 +4,8 @@
 # SDL_mixer
 PKG             := sdl_mixer
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.11
-$(PKG)_CHECKSUM := ef5d45160babeb51eafa7e4019cec38324ee1a5d
+$(PKG)_VERSION  := 1.2.12
+$(PKG)_CHECKSUM := a20fa96470ad9e1052f1957b77ffa68fb090b384
 $(PKG)_SUBDIR   := SDL_mixer-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL_mixer-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.libsdl.org/projects/SDL_mixer/
--- a/src/sdl_net.mk	Wed Jan 25 09:37:16 2012 +0100
+++ b/src/sdl_net.mk	Wed Jan 25 22:46:08 2012 +0100
@@ -4,8 +4,8 @@
 # SDL_net
 PKG             := sdl_net
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.7
-$(PKG)_CHECKSUM := b46c7e3221621cc34fec1238f1b5f0ce8972274d
+$(PKG)_VERSION  := 1.2.8
+$(PKG)_CHECKSUM := fd393059fef8d9925dc20662baa3b25e02b8405d
 $(PKG)_SUBDIR   := SDL_net-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL_net-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.libsdl.org/projects/SDL_net/
@@ -32,5 +32,5 @@
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_net.exe' \
-        `'$(TARGET)-pkg-config' sdl --cflags --libs` -lSDL_net -lws2_32
+        `'$(TARGET)-pkg-config' sdl --cflags --libs` -lSDL_net -lws2_32 -liphlpapi
 endef