diff options
| -rw-r--r-- | emulators/vba/distinfo | 3 | ||||
| -rw-r--r-- | emulators/vba/patches/patch-ag | 15 | ||||
| -rw-r--r-- | emulators/vice/distinfo | 3 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-ac | 38 | ||||
| -rw-r--r-- | multimedia/xine-ui/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/xine-ui/patches/patch-ac | 15 |
6 files changed, 74 insertions, 3 deletions
diff --git a/emulators/vba/distinfo b/emulators/vba/distinfo index dfba334d9d5..f73551443a3 100644 --- a/emulators/vba/distinfo +++ b/emulators/vba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2007/02/16 01:52:20 wiz Exp $ +$NetBSD: distinfo,v 1.5 2011/01/14 11:40:55 wiz Exp $ SHA1 (VisualBoyAdvance-src-1.7.2.tar.gz) = 04d82406079563fd17cda07f72488185e9152f51 RMD160 (VisualBoyAdvance-src-1.7.2.tar.gz) = 44f94a4f270f2cda25879681c52892f6978caf99 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 33158335dc12f335471d10962b4552082b589d25 SHA1 (patch-ad) = b61c4053bbed582db5df2039c20b436e1d9e1ff1 SHA1 (patch-ae) = b7e08365abd77b5c0f3473b4ce091b747298dfc8 SHA1 (patch-af) = 0b194e624acb083942bd8f9f1a56c34bdd97d9e4 +SHA1 (patch-ag) = bd304939c7f104e6114a5078f4347b37761a1ede diff --git a/emulators/vba/patches/patch-ag b/emulators/vba/patches/patch-ag new file mode 100644 index 00000000000..1ee8ba51d05 --- /dev/null +++ b/emulators/vba/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1 2011/01/14 11:40:55 wiz Exp $ + +Fix build with png-1.5. + +--- src/Util.cpp.orig 2004-05-20 17:42:37.000000000 +0000 ++++ src/Util.cpp +@@ -79,7 +79,7 @@ bool utilWritePNGFile(const char *fileNa + return false; + } + +- if(setjmp(png_ptr->jmpbuf)) { ++ if(setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr,NULL); + fclose(fp); + return false; 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); + diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo index 7ae78c1c300..1c9fb413a43 100644 --- a/multimedia/xine-ui/distinfo +++ b/multimedia/xine-ui/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.18 2010/05/07 17:46:24 drochner Exp $ +$NetBSD: distinfo,v 1.19 2011/01/14 11:42:57 wiz Exp $ SHA1 (xine-ui-0.99.6.tar.bz2) = a8d6ab9a9e4cbeb0a5d677d6948e23d11019fc5b RMD160 (xine-ui-0.99.6.tar.bz2) = 6cdf639b5ffff54bacfa0a7bef65af1e7ebcacee Size (xine-ui-0.99.6.tar.bz2) = 2180633 bytes SHA1 (patch-aa) = f812ef6651d364030bad754f386f4d64c5cd8022 SHA1 (patch-ab) = 5d9754d3824f66a80bc3a7bd2418870b1fae3b9f +SHA1 (patch-ac) = a181b535e699d75145c6efb2ac4455e71ee90f4d SHA1 (patch-ae) = 1d5887168efd340f047dfdb9e135ce12c18e2d5f SHA1 (patch-ag) = 0f1686bba57805e2dccf939e5733faf997bc14f7 SHA1 (patch-ah) = 9beaee5509306e6afa1b06aef4eab24635c2a79e diff --git a/multimedia/xine-ui/patches/patch-ac b/multimedia/xine-ui/patches/patch-ac new file mode 100644 index 00000000000..bffc7991b0a --- /dev/null +++ b/multimedia/xine-ui/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.4 2011/01/14 11:42:57 wiz Exp $ + +Fix build with png-1.5. + +--- src/xitk/Imlib-light/load.c.orig 2010-03-01 17:02:05.000000000 +0000 ++++ src/xitk/Imlib-light/load.c +@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id, + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; |