diff options
| author | wiz <wiz@pkgsrc.org> | 2011-02-01 00:29:26 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-02-01 00:29:26 +0000 |
| commit | 29da7baa34ac8790012edbde0fa2081317ad184f (patch) | |
| tree | 14fe0c0281652b8137fc06d0128639fd1d52616d /games/lbreakout2 | |
| parent | de2d007aea7afc3a3862cd1031db1b80f5f425f4 (diff) | |
| download | pkgsrc-29da7baa34ac8790012edbde0fa2081317ad184f.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'games/lbreakout2')
| -rw-r--r-- | games/lbreakout2/distinfo | 3 | ||||
| -rw-r--r-- | games/lbreakout2/patches/patch-gui_stk.c | 61 |
2 files changed, 63 insertions, 1 deletions
diff --git a/games/lbreakout2/distinfo b/games/lbreakout2/distinfo index 64c5fe3a75b..2a72c3c0bfe 100644 --- a/games/lbreakout2/distinfo +++ b/games/lbreakout2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2011/01/11 20:20:53 drochner Exp $ +$NetBSD: distinfo,v 1.12 2011/02/01 00:29:26 wiz Exp $ SHA1 (lbreakout2-2.6.2.tar.gz) = dc0bdde272351945b48a09277275ac3fd5d513f4 RMD160 (lbreakout2-2.6.2.tar.gz) = 5382731dfdef5343957a722a4b23af05ebb0a1b1 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = beee4c08af31eb515ddea2e512db1f6f7cb7dcf1 SHA1 (patch-ac) = 67405340bf632d93d767e0d4c1f3df23c07e7a1e SHA1 (patch-ad) = b3f093e83b94d83ec4bcd7665b21cc6f969519a8 SHA1 (patch-ae) = 33ca52782b945460197a32128d850839a1798cd5 +SHA1 (patch-gui_stk.c) = 17b46d40e760e13507d704783ecd161ccbc3b1b0 diff --git a/games/lbreakout2/patches/patch-gui_stk.c b/games/lbreakout2/patches/patch-gui_stk.c new file mode 100644 index 00000000000..7a84a27e5d1 --- /dev/null +++ b/games/lbreakout2/patches/patch-gui_stk.c @@ -0,0 +1,61 @@ +$NetBSD: patch-gui_stk.c,v 1.1 2011/02/01 00:29:26 wiz Exp $ + +Fix build with png-1.5. + +--- gui/stk.c.orig 2010-10-04 13:40:45.000000000 +0000 ++++ gui/stk.c +@@ -105,7 +105,7 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R + * 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(png_jmpbuf(png_ptr)) ) { + IMG_SetError("Error reading the PNG file."); + goto done; + } +@@ -174,9 +174,9 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R + Rmask = 0x000000FF; + Gmask = 0x0000FF00; + Bmask = 0x00FF0000; +- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; ++ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; + } else { +- int s = (info_ptr->channels == 4) ? 0 : 8; ++ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; + Rmask = 0xFF000000 >> s; + Gmask = 0x00FF0000 >> s; + Bmask = 0x0000FF00 >> s; +@@ -184,7 +184,7 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R + } + } + surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, +- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); ++ bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); + if ( surface == NULL ) { + IMG_SetError("Out of memory"); + goto done; +@@ -229,12 +229,18 @@ static SDL_Surface *IMG_LoadPNG_RW(SDL_R + 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 { ++ png_colorp file_palette; ++ int file_num_palette; ++ png_get_PLTE(png_ptr, info_ptr, &file_palette, ++ &file_num_palette); ++ if (file_num_palette > 0 ) { ++ palette->ncolors = file_num_palette; ++ for( i=0; i<file_num_palette; ++i ) { ++ palette->colors[i].b = file_palette[i].blue; ++ palette->colors[i].g = file_palette[i].green; ++ palette->colors[i].r = file_palette[i].red; ++ } + } + } + } |