diff options
author | wiz <wiz> | 2012-01-28 11:00:01 +0000 |
---|---|---|
committer | wiz <wiz> | 2012-01-28 11:00:01 +0000 |
commit | 53d170eeb4c687aab5e6d75ccc53663260beb34d (patch) | |
tree | 0fdcacd8e8b8f194b51c4e3f25fe47e701961184 /graphics | |
parent | 4bca171a8a051fb0c50dcd8a276b0543ab45d410 (diff) | |
download | pkgsrc-53d170eeb4c687aab5e6d75ccc53663260beb34d.tar.gz |
Update to 1.2.12. Add webp support. Update LICENSE (see below).
While here, remove png/tiff/jpeg includes from buildlink3.mk
since they are hidden by the library (library not linked against
them, headers not included in public headers). Recursive bump
coming next.
1.2.12:
Sam Lantinga - Thu Jan 19 23:18:09 EST 2012
* Fixed regression in 1.2.11 loading 8-bit PNG images with libpng
1.2.11:
Sam Lantinga - Sat Jan 14 17:54:38 EST 2012
* Fixed loading 8-bit PNG images on Mac OS X
Sam Lantinga - Sat Dec 31 09:35:40 EST 2011
* SDL_image is now under the zlib license
Michael Bonfils - Mon Nov 28 21:46:00 EST 2011
* Added WEBP image support
Thomas Klausner - Wed Jan 19 19:31:25 PST 2011
* Fixed compiling with libpng 1.4
Sam Lantinga - Mon Jan 10 12:09:57 2011 -0800
* Added Android.mk to build on the Android platform
Sam Lantinga - Mon May 10 22:42:53 PDT 2010
* Fixed loading HAM6 images with stencil mask
Mark Tucker - Fri, 27 Nov 2009 12:38:21 -0500
* Fixed bug loading 15 and 16 bit BMP images
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/SDL_image/Makefile | 8 | ||||
-rw-r--r-- | graphics/SDL_image/buildlink3.mk | 7 | ||||
-rw-r--r-- | graphics/SDL_image/distinfo | 9 | ||||
-rw-r--r-- | graphics/SDL_image/patches/patch-aa | 142 |
4 files changed, 10 insertions, 156 deletions
diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile index e82699693b6..556c30d4955 100644 --- a/graphics/SDL_image/Makefile +++ b/graphics/SDL_image/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.39 2011/01/13 13:36:11 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2012/01/28 11:00:01 wiz Exp $ -DISTNAME= SDL_image-1.2.10 -PKGREVISION= 3 +DISTNAME= SDL_image-1.2.12 CATEGORIES= graphics devel MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.libsdl.org/projects/SDL_image/ COMMENT= Load images as SDL surfaces -LICENSE= gnu-lgpl-v2.1 +LICENSE= zlib CONFLICTS= SDL-image-[0-9]* @@ -29,6 +28,7 @@ post-install: BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.10 .include "../../devel/SDL/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk index 26c424d2b64..82cda2f058a 100644 --- a/graphics/SDL_image/buildlink3.mk +++ b/graphics/SDL_image/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2011/01/13 13:36:11 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2012/01/28 11:00:01 wiz Exp $ BUILDLINK_TREE+= SDL_image @@ -6,14 +6,11 @@ BUILDLINK_TREE+= SDL_image SDL_IMAGE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1 -BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.10nb3 +BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.12 BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image BUILDLINK_INCDIRS.SDL_image?= include/SDL .include "../../devel/SDL/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" .endif # SDL_IMAGE_BUILDLINK3_MK BUILDLINK_TREE+= -SDL_image diff --git a/graphics/SDL_image/distinfo b/graphics/SDL_image/distinfo index e2e245c34ca..d4ce3d3c08d 100644 --- a/graphics/SDL_image/distinfo +++ b/graphics/SDL_image/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.14 2011/05/27 16:23:53 hans Exp $ +$NetBSD: distinfo,v 1.15 2012/01/28 11:00:01 wiz Exp $ -SHA1 (SDL_image-1.2.10.tar.gz) = 6bae71fdfd795c3dbf39f6c7c0cf8b212914ef97 -RMD160 (SDL_image-1.2.10.tar.gz) = 8133f7f8d488b1c3f69ad80a941289b4508d2901 -Size (SDL_image-1.2.10.tar.gz) = 1332906 bytes -SHA1 (patch-aa) = 850aebb084bf8bb9a3c0e3def66f89f265180862 +SHA1 (SDL_image-1.2.12.tar.gz) = 5e3e393d4e366638048bbb10d6a269ea3f4e4cf2 +RMD160 (SDL_image-1.2.12.tar.gz) = 206990959c6b225286c0a19bc05b991c6bc2c3e8 +Size (SDL_image-1.2.12.tar.gz) = 2231074 bytes diff --git a/graphics/SDL_image/patches/patch-aa b/graphics/SDL_image/patches/patch-aa deleted file mode 100644 index eddf4081731..00000000000 --- a/graphics/SDL_image/patches/patch-aa +++ /dev/null @@ -1,142 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2011/05/27 16:23:53 hans Exp $ - -Fix build with png-1.5. - ---- IMG_png.c.orig 2009-11-08 11:55:32.000000000 +0100 -+++ IMG_png.c 2011-05-27 19:00:27.419279003 +0200 -@@ -80,6 +80,8 @@ 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); -+ 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 +93,7 @@ static struct { - 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); -+ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); - } lib; - - #ifdef LOAD_PNG_DYNAMIC -@@ -129,6 +132,13 @@ int IMG_InitPNG() - 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 +146,13 @@ int IMG_InitPNG() - 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 +230,13 @@ int IMG_InitPNG() - SDL_UnloadObject(lib.handle); - return -1; - } -+ 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; -+ } - } - ++lib.loaded; - -@@ -236,7 +260,9 @@ int IMG_InitPNG() - 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 +274,7 @@ int IMG_InitPNG() - 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; -+ lib.png_set_longjmp_fn = png_set_longjmp_fn; - } - ++lib.loaded; - -@@ -347,7 +374,7 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s - * 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) ) { -+ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf)))) { - error = "Error reading the PNG file."; - goto done; - } -@@ -416,9 +443,9 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s - 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 +453,7 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s - } - } - 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 +494,9 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s - /* 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 +504,12 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s - 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; 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 if (png_num_palette > 0 ) { -+ palette->ncolors = png_num_palette; -+ for( i=0; i<png_num_palette; ++i ) { -+ palette->colors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; - } - } - } |