diff options
| author | wiz <wiz> | 2011-01-14 11:38:38 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-14 11:38:38 +0000 |
| commit | f7e011729da11465a974172f37226e3289ff7a0a (patch) | |
| tree | 1b5d86cf4e6ed0c7ed5042941ea644d6d570f692 /emulators/vice | |
| parent | db4c185258d05362b2491f18989bc5c7518f3e87 (diff) | |
| download | pkgsrc-f7e011729da11465a974172f37226e3289ff7a0a.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'emulators/vice')
| -rw-r--r-- | emulators/vice/distinfo | 3 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-ac | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index 7137accac2e..b90a228985d 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2010/07/24 09:44:57 wiz Exp $ +$NetBSD: distinfo,v 1.36 2011/01/14 11:38:38 wiz Exp $ SHA1 (vice-2.2.tar.gz) = 88ec1f4fefc708957b242805a28ca9b26a3e2738 RMD160 (vice-2.2.tar.gz) = d3fb33deb776ffcae297df413849437fb4e49840 @@ -8,4 +8,5 @@ RMD160 (vice_2_2_netbsd.patch) = 26cd48aa79eae7976f41f4dacf972d81c5da788e Size (vice_2_2_netbsd.patch) = 4437 bytes SHA1 (patch-aa) = 08ac51c0674fde12ff0032a69f7c301464c1b408 SHA1 (patch-ab) = 982424905a9fb8eb011d19b3ec649b5d7a01ca83 +SHA1 (patch-ac) = 963708313f79e4f017ea31b073e6676827fc769a SHA1 (patch-ad) = 0ace2e00ed2f66c8669ec745b62118570187735a diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac new file mode 100644 index 00000000000..0d6cea4641d --- /dev/null +++ b/emulators/vice/patches/patch-ac @@ -0,0 +1,38 @@ +$NetBSD: patch-ac,v 1.18 2011/01/14 11:38:38 wiz Exp $ + +Fix build with png-1.5. + +--- src/gfxoutputdrv/pngdrv.c.orig 2009-08-09 17:23:44.000000000 +0000 ++++ src/gfxoutputdrv/pngdrv.c +@@ -31,6 +31,7 @@ + #include <stdlib.h> + + #include <png.h> ++#include <zlib.h> + + #include "archdep.h" + #include "gfxoutput.h" +@@ -76,7 +77,7 @@ static int pngdrv_open(screenshot_t *scr + return -1; + } + +- if (setjmp(screenshot->gfxoutputdrv_data->png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(screenshot->gfxoutputdrv_data->png_ptr))) { + png_destroy_write_struct(&(screenshot->gfxoutputdrv_data->png_ptr), + &(screenshot->gfxoutputdrv_data->info_ptr)); + lib_free(sdata); +@@ -99,10 +100,10 @@ static int pngdrv_open(screenshot_t *scr + png_init_io(sdata->png_ptr, sdata->fd); + png_set_compression_level(sdata->png_ptr, Z_BEST_COMPRESSION); + +- sdata->info_ptr->width = screenshot->width; +- sdata->info_ptr->height= screenshot->height; +- sdata->info_ptr->bit_depth = 8; +- sdata->info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ png_set_IHDR(sdata->png_ptr, sdata->info_ptr, screenshot->width, ++ screenshot->height, 8, PNG_COLOR_TYPE_RGB_ALPHA, ++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, ++ PNG_FILTER_TYPE_DEFAULT); + + png_write_info(sdata->png_ptr, sdata->info_ptr); + |