diff options
| author | rillig <rillig@pkgsrc.org> | 2005-08-29 10:50:57 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-08-29 10:50:57 +0000 |
| commit | c437baf5bdeb2cf00a42918cfb983c50103aba27 (patch) | |
| tree | bdb820fa9ae9cdc8e4522cc8fd943f5fcb70421a /games | |
| parent | 44231ebdeb7b985eb323393d1de79178f5949445 (diff) | |
| download | pkgsrc-c437baf5bdeb2cf00a42918cfb983c50103aba27.tar.gz | |
Added two patches to make enigma run on NetBSD-1.6.2/i386 with g++-2.95.
Diffstat (limited to 'games')
| -rw-r--r-- | games/enigma/distinfo | 4 | ||||
| -rw-r--r-- | games/enigma/patches/patch-ao | 14 | ||||
| -rw-r--r-- | games/enigma/patches/patch-ap | 37 |
3 files changed, 54 insertions, 1 deletions
diff --git a/games/enigma/distinfo b/games/enigma/distinfo index 8f6ad0554f9..e0b08668f01 100644 --- a/games/enigma/distinfo +++ b/games/enigma/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/08/22 15:35:37 adam Exp $ +$NetBSD: distinfo,v 1.6 2005/08/29 10:50:57 rillig Exp $ SHA1 (enigma-0.92.tar.gz) = 39aa8f4222945d91243387b42935ca074c2f0506 RMD160 (enigma-0.92.tar.gz) = cdbe27425534792ac0199525db1d6068aefacebd @@ -10,3 +10,5 @@ SHA1 (patch-af) = 5d79079b9bd4237d3d1c0ba08dd05cc6fade556a SHA1 (patch-ag) = a3cdad78fde86ac21c23d66142a65088a6ba8b8f SHA1 (patch-am) = 84c906c26702866d24fe6dc2e536932be2daf175 SHA1 (patch-an) = b434ffcf0e2623b255cd87f92c717bc7efdc0152 +SHA1 (patch-ao) = b73f2de2443ecce8fa2e11bba6c69f3fbaf80a89 +SHA1 (patch-ap) = 493674539e96bb4ce19599bde64d7cb922ecd82d diff --git a/games/enigma/patches/patch-ao b/games/enigma/patches/patch-ao new file mode 100644 index 00000000000..ae400a2e4d7 --- /dev/null +++ b/games/enigma/patches/patch-ao @@ -0,0 +1,14 @@ +$NetBSD: patch-ao,v 1.1 2005/08/29 10:50:57 rillig Exp $ + +LC_MESSAGES needs <clocale>. + +--- src/nls.cc.orig Tue Jan 25 14:53:16 2005 ++++ src/nls.cc Mon Aug 29 12:32:50 2005 +@@ -5,6 +5,7 @@ + #include <iostream> + #include <string> + #include <cstdlib> ++#include <clocale> + + #include <config.h> + diff --git a/games/enigma/patches/patch-ap b/games/enigma/patches/patch-ap new file mode 100644 index 00000000000..8bd6bdc329a --- /dev/null +++ b/games/enigma/patches/patch-ap @@ -0,0 +1,37 @@ +$NetBSD: patch-ap,v 1.1 2005/08/29 10:50:57 rillig Exp $ + +ISO C90 compatibility mode. + +--- src/px/IMG_SavePNG.c.orig Thu Dec 30 14:21:11 2004 ++++ src/px/IMG_SavePNG.c Mon Aug 29 12:26:59 2005 +@@ -63,10 +63,11 @@ int IMG_SavePNG_RW(SDL_Surface *face, SD + rmask, gmask, bmask, amask); + + if (surface) { ++ png_structp png_ptr; + SDL_BlitSurface(face, NULL, surface, NULL); + SDL_LockSurface(surface); + +- png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, png_user_error, png_user_warn); ++ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, png_user_error, png_user_warn); + if (!png_ptr) { + IMG_SetError("Couldn't allocate memory for PNG file"); + } +@@ -84,6 +85,8 @@ int IMG_SavePNG_RW(SDL_Surface *face, SD + IMG_SetError("Error writing the PNG file"); + } + else { ++ int colortype; ++ + png_set_write_fn(png_ptr, src, png_write_data, png_io_flush); + /* Set the image information here. Width and height are up to 2^31, + * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on +@@ -93,7 +96,7 @@ int IMG_SavePNG_RW(SDL_Surface *face, SD + * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST + * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED + */ +- int colortype = png_colortype_from_surface(surface); ++ colortype = png_colortype_from_surface(surface); + png_set_IHDR(png_ptr, info_ptr, surface->w, surface->h, 8, + colortype, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + |