From 2f8d0544102f7bebdad2b09978d4bd1c1580ba85 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 23 Jan 2012 10:34:55 +0000 Subject: main/sdl_image: upgrade to 1.2.12 --- main/sdl_image/APKBUILD | 8 +- main/sdl_image/sdl-image-1.2.10-libpng15.patch | 160 ------------------------- 2 files changed, 3 insertions(+), 165 deletions(-) delete mode 100644 main/sdl_image/sdl-image-1.2.10-libpng15.patch diff --git a/main/sdl_image/APKBUILD b/main/sdl_image/APKBUILD index bc95db1a602..4c1fcb56ae8 100644 --- a/main/sdl_image/APKBUILD +++ b/main/sdl_image/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa pkgname=sdl_image -pkgver=1.2.10 -pkgrel=2 +pkgver=1.2.12 +pkgrel=0 pkgdesc="A simple library to load images of various formats as SDL surfaces" url="http://www.libsdl.org/projects/SDL_image/" arch="all" @@ -12,7 +12,6 @@ makedepends="sdl-dev libpng-dev jpeg-dev tiff-dev zlib-dev" install= subpackages="$pkgname-dev" source="http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz - sdl-image-1.2.10-libpng15.patch " _builddir="$srcdir"/SDL_image-$pkgver @@ -42,5 +41,4 @@ package() { } -md5sums="6c06584b31559e2b59f2b982d0d1f628 SDL_image-1.2.10.tar.gz -53cb7b90cce2526570cfe0f8f80baa3e sdl-image-1.2.10-libpng15.patch" +md5sums="a0f9098ebe5400f0bdc9b62e60797ecb SDL_image-1.2.12.tar.gz" diff --git a/main/sdl_image/sdl-image-1.2.10-libpng15.patch b/main/sdl_image/sdl-image-1.2.10-libpng15.patch deleted file mode 100644 index d319045e0fa..00000000000 --- a/main/sdl_image/sdl-image-1.2.10-libpng15.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- ./IMG_png.c -+++ ./IMG_png.c -@@ -71,6 +71,10 @@ - #endif - #include - -+/* Check for the older version of libpng */ -+#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) -+#define LIBPNG_VERSION_12 -+#endif - - static struct { - int loaded; -@@ -80,6 +84,8 @@ - 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); -+ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); -+ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); - 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); - void (*png_read_image) (png_structp png_ptr, png_bytepp image); -@@ -91,6 +97,9 @@ - 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); - int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); -+#ifndef LIBPNG_VERSION_12 -+ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); -+#endif - } lib; - - #ifdef LOAD_PNG_DYNAMIC -@@ -129,6 +138,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_channels = -+ (png_byte (*) (png_structp, png_infop)) -+ SDL_LoadFunction(lib.handle, "png_get_channels"); -+ if ( lib.png_get_channels == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_io_ptr = - (png_voidp (*) (png_structp)) - SDL_LoadFunction(lib.handle, "png_get_io_ptr"); -@@ -136,6 +152,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_PLTE = -+ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) -+ SDL_LoadFunction(lib.handle, "png_get_PLTE"); -+ if ( lib.png_get_PLTE == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_tRNS = - (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) - SDL_LoadFunction(lib.handle, "png_get_tRNS"); -@@ -213,6 +236,15 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = -+ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) -+ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); -+ if ( lib.png_set_longjmp_fn == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -+#endif - } - ++lib.loaded; - -@@ -236,7 +268,9 @@ - lib.png_create_read_struct = png_create_read_struct; - lib.png_destroy_read_struct = png_destroy_read_struct; - lib.png_get_IHDR = png_get_IHDR; -+ lib.png_get_channels = png_get_channels; - lib.png_get_io_ptr = png_get_io_ptr; -+ lib.png_get_PLTE = png_get_PLTE; - lib.png_get_tRNS = png_get_tRNS; - lib.png_get_valid = png_get_valid; - lib.png_read_image = png_read_image; -@@ -248,6 +282,9 @@ - lib.png_set_read_fn = png_set_read_fn; - lib.png_set_strip_16 = png_set_strip_16; - lib.png_sig_cmp = png_sig_cmp; -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = png_set_longjmp_fn; -+#endif - } - ++lib.loaded; - -@@ -347,7 +384,12 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if ( setjmp(png_ptr->jmpbuf) ) { -+#ifndef LIBPNG_VERSION_12 -+ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) -+#else -+ if ( setjmp(png_ptr->jmpbuf) ) -+#endif -+ { - error = "Error reading the PNG file."; - goto done; - } -@@ -416,9 +458,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -426,7 +468,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -467,6 +509,9 @@ - /* Load the palette, if any */ - palette = surface->format->palette; - if ( palette ) { -+ int png_num_palette; -+ png_colorp png_palette; -+ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); - if(color_type == PNG_COLOR_TYPE_GRAY) { - palette->ncolors = 256; - for(i = 0; i < 256; i++) { -@@ -474,12 +519,12 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0 ) { -- palette->ncolors = info_ptr->num_palette; -- for( i=0; inum_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 if (png_num_palette > 0 ) { -+ palette->ncolors = png_num_palette; -+ for( i=0; icolors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; - } - } - } -- cgit v1.2.3