head 1.9; access; symbols pkgsrc-2014Q2:1.8.0.16 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.14 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.12 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.10 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.6 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.4 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.2 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.7.0.12 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.10 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.8 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.6 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.4 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.2 pkgsrc-2011Q1-base:1.7 pkgsrc-2009Q4:1.5.0.22 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.20 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.18 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.16 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.14 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.12 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.10 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.8 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.6 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.4 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.2 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.4.0.18 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.16 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.14 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.12 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.10 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.8 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.6 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.4 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.2 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.9 date 2014.07.13.09.17.04; author mbalmer; state dead; branches; next 1.8; commitid WzjX0yM33DnbicIx; 1.8 date 2012.07.30.01.19.16; author dholland; state Exp; branches; next 1.7; 1.7 date 2011.01.29.14.42.52; author wiz; state Exp; branches; next 1.6; 1.6 date 2011.01.29.14.17.34; author wiz; state Exp; branches; next 1.5; 1.5 date 2006.10.02.23.03.33; author rillig; state dead; branches; next 1.4; 1.4 date 2004.07.14.21.06.57; author ben; state Exp; branches; next 1.3; 1.3 date 2004.03.24.11.56.00; author wiz; state Exp; branches; next 1.2; 1.2 date 2003.08.07.12.11.12; author seb; state dead; branches; next 1.1; 1.1 date 2002.03.25.16.19.31; author atatat; state Exp; branches; next ; desc @@ 1.9 log @Update XaoS to version 3.6. From Olaf 'Rhialto' Seibert, thanks! Closes PR/48836. @ text @$NetBSD: patch-ab,v 1.8 2012/07/30 01:19:16 dholland Exp $ Fix build with png-1.5 (untested, waiting for confirmation). http://code.google.com/p/gnuxaos/issues/detail?id=55 --- src/util/png.c.orig 2009-07-17 23:50:39.000000000 +0000 +++ src/util/png.c @@@@ -3,6 +3,7 @@@@ #include #ifdef USE_PNG #include +#include #endif #include #include @@@@ -31,6 +32,9 @@@@ CONST char *writepng(FILE * file, CONST png_structp png_ptr; png_infop info_ptr; png_color palette[256]; + png_color_8 sig_bit; + int color_type; + int bit_depth; volatile unsigned short a = 255; volatile unsigned char *b = (volatile unsigned char *) &a; #ifdef _undefined_ @@@@ -59,7 +63,7 @@@@ CONST char *writepng(FILE * file, CONST png_destroy_write_struct(&png_ptr, (png_infopp) NULL); return "No memory to create png info structure"; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); fclose(file); return strerror(errno); @@@@ -78,57 +82,72 @@@@ CONST char *writepng(FILE * file, CONST png_set_compression_window_bits(png_ptr, 15); png_set_compression_method(png_ptr, 8); - info_ptr->width = image->width; - info_ptr->height = image->height; - /*info_ptr->gamma=1.0; */ - info_ptr->gamma = 0.5; - info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs; - info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth); - info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight); - + switch (image->palette->type) + { + case C256: + color_type = PNG_COLOR_TYPE_PALETTE; + bit_depth = image->bytesperpixel * 8; + break; + case SMALLITER: + case LARGEITER: + case GRAYSCALE: + color_type = PNG_COLOR_TYPE_GRAY; + bit_depth = image->bytesperpixel * 8; + break; + case TRUECOLOR: + case TRUECOLOR24: + case TRUECOLOR16: + color_type = PNG_COLOR_TYPE_RGB; + bit_depth = 8; + break; + } + + png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth, + color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, + PNG_FILTER_TYPE_BASE); switch (image->palette->type) { case C256: { int i; - info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; - info_ptr->bit_depth = image->bytesperpixel * 8; - info_ptr->palette = palette; - info_ptr->valid |= PNG_INFO_PLTE; + png_color png_palette[257]; + int png_num_palette; for (i = 0; i < image->palette->end; i++) - info_ptr->palette[i].red = image->palette->rgb[i][0], - info_ptr->palette[i].green = image->palette->rgb[i][1], - info_ptr->palette[i].blue = image->palette->rgb[i][2], - info_ptr->num_palette = image->palette->end; + png_palette[i].red = image->palette->rgb[i][0], + png_palette[i].green = image->palette->rgb[i][1], + png_palette[i].blue = image->palette->rgb[i][2], + png_num_palette = image->palette->end; + png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette); } break; - case SMALLITER: - case LARGEITER: - case GRAYSCALE: - info_ptr->color_type = PNG_COLOR_TYPE_GRAY; - info_ptr->bit_depth = image->bytesperpixel * 8; - break; case TRUECOLOR: case TRUECOLOR24: case TRUECOLOR16: - info_ptr->color_type = PNG_COLOR_TYPE_RGB; - info_ptr->bit_depth = 8; - info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec; - info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec; - info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec; + { + sig_bit.red = 8 - image->palette->info.truec.rprec; + sig_bit.green = 8 - image->palette->info.truec.gprec; + sig_bit.blue = 8 - image->palette->info.truec.bprec; + png_set_sBIT(png_ptr, info_ptr, &sig_bit); + } break; } - info_ptr->interlace_type = 0; + + png_write_info(png_ptr, info_ptr); + #ifdef _undefined_ png_set_text(png_ptr, info_ptr, comments, sizeof(comments) / sizeof(png_text)); #endif - png_write_info(png_ptr, info_ptr); + png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */); + png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth), + (png_uint_32) (100 / image->pixelheight), PNG_RESOLUTION_UNKNOWN); + + /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */ png_set_packing(png_ptr); if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16)) - png_set_shift(png_ptr, &(info_ptr->sig_bit)); + png_set_shift(png_ptr, &sig_bit); if (*b == 255) png_set_swap(png_ptr); png_set_bgr(png_ptr); @ 1.8 log @Update to 3.5. Upstream changes: - Portuguese translation - bug fixes - more examples - new documentation infrastructure @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2011/01/29 14:42:52 wiz Exp $ @ 1.7 log @Add upstream bug report URL. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2011/01/29 14:17:34 wiz Exp $ d6 1 a6 1 --- src/util/png.c.orig 2003-02-03 16:16:46.000000000 +0000 d16 9 a24 9 @@@@ -33,6 +34,9 @@@@ writepng (FILE * file, CONST struct imag png_structp png_ptr; png_infop info_ptr; png_color palette[256]; + png_color_8 sig_bit; + int color_type; + int bit_depth; volatile unsigned short a = 255; volatile unsigned char *b = (volatile unsigned char *) &a; d26 3 a28 3 @@@@ -62,7 +66,7 @@@@ writepng (FILE * file, CONST struct imag png_destroy_write_struct (&png_ptr, (png_infopp) NULL); return "No memory to create png info structure"; d30 8 a37 8 - if (setjmp (png_ptr->jmpbuf)) + if (setjmp (png_jmpbuf(png_ptr))) { png_destroy_write_struct (&png_ptr, &info_ptr); fclose (file); @@@@ -82,58 +86,73 @@@@ writepng (FILE * file, CONST struct imag png_set_compression_window_bits (png_ptr, 15); png_set_compression_method (png_ptr, 8); d39 31 a69 30 - info_ptr->width = image->width; - info_ptr->height = image->height; - /*info_ptr->gamma=1.0; */ - info_ptr->gamma = 0.5; - info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs; - info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth); - info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight); + switch (image->palette->type) + { + case C256: + color_type = PNG_COLOR_TYPE_PALETTE; + bit_depth = image->bytesperpixel * 8; + break; + case SMALLITER: + case LARGEITER: + case GRAYSCALE: + color_type = PNG_COLOR_TYPE_GRAY; + bit_depth = image->bytesperpixel * 8; + break; + case TRUECOLOR: + case TRUECOLOR24: + case TRUECOLOR16: + color_type = PNG_COLOR_TYPE_RGB; + bit_depth = 8; + break; + } + png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth, + color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, + PNG_FILTER_TYPE_BASE); d71 1 a71 2 switch (image->palette->type) { d73 20 a92 20 { int i; - info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; - info_ptr->bit_depth = image->bytesperpixel * 8; - info_ptr->palette = palette; - info_ptr->valid |= PNG_INFO_PLTE; + png_color png_palette[257]; + int png_num_palette; for (i = 0; i < image->palette->end; i++) - info_ptr->palette[i].red = image->palette->rgb[i][0], - info_ptr->palette[i].green = image->palette->rgb[i][1], - info_ptr->palette[i].blue = image->palette->rgb[i][2], - info_ptr->num_palette = image->palette->end; + png_palette[i].red = image->palette->rgb[i][0], + png_palette[i].green = image->palette->rgb[i][1], + png_palette[i].blue = image->palette->rgb[i][2], + png_num_palette = image->palette->end; + png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette); } break; d96 3 a98 3 - info_ptr->color_type = PNG_COLOR_TYPE_GRAY; - info_ptr->bit_depth = image->bytesperpixel * 8; - break; d102 12 a113 12 - info_ptr->color_type = PNG_COLOR_TYPE_RGB; - info_ptr->bit_depth = 8; - info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec; - info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec; - info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec; + { + sig_bit.red = 8 - image->palette->info.truec.rprec; + sig_bit.green = 8 - image->palette->info.truec.gprec; + sig_bit.blue = 8 - image->palette->info.truec.bprec; + png_set_sBIT(png_ptr, info_ptr, &sig_bit); + } break; d115 1 a115 1 - info_ptr->interlace_type = 0; d117 1 a117 1 + png_write_info (png_ptr, info_ptr); d120 2 a121 2 png_set_text (png_ptr, info_ptr, comments, sizeof (comments) / sizeof (png_text)); d124 4 a127 4 - png_write_info (png_ptr, info_ptr); + png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */); + png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth), + (png_uint_32) (100 / image->pixelheight), PNG_RESOLUTION_UNKNOWN); d130 8 a137 8 /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */ png_set_packing (png_ptr); if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16)) - png_set_shift (png_ptr, &(info_ptr->sig_bit)); + png_set_shift (png_ptr, &sig_bit); if (*b == 255) png_set_swap (png_ptr); png_set_bgr (png_ptr); @ 1.6 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ d4 1 @ 1.5 log @Updated XaoS to 3.2.2. Changes since 3.1: RELEASE NOTES FOR XAOS VERSION 3.2.2 ------------------------------------ This release contains a rewritten Mac OS X port by J. B. Langston III, and some small fixes for pipes by Marton Torok. For more details please read the ChangeLog file. RELEASE NOTES FOR XAOS VERSION 3.2.1 ------------------------------------ A new fractal type, the Spidron hornflake has appeared. We changed the web site to a dokuwiki database, so the help system contains now a converter for dokuwiki (not completely working yet). STICKY/DESTDIR is now supported (by Claudio Fontana). The French translation is updated (by Philippe Wautelet). Bigger fonts are available for Latin-2 based usage if the user changes the screen resolution more than 800x600 or 1000x720. Some small fixes have been done in the catalog files. RELEASE NOTES FOR XAOS VERSION 3.2 ---------------------------------- Main points are the classic Sierpinski and Koch fractals, but still other formulas are introduced. Some 'oldie but goldie' fractals are included from the Fractint formula database. The keystroke order has been changed a little bit. Now gcc-4.0.x is also supported (-mcpu is deprecated now and the source had to be modified for this). The new formulas are demonstrated with 3 new tutorial movies. These are also available in Hungarian language. Volunteers are requested to translate the new movies into other languages. RELEASE NOTES FOR XAOS VERSION 3.1.3 ------------------------------------ Using this release gcc version 4.0 should also compile the code, not only the 3.x versions. Two new fractal types were also added. In addition, the DirectX header files have been fixed. The French translations are updated. RELEASE NOTES FOR XAOS VERSION 3.1.2 ------------------------------------ This release is a fast bugfix for some gcc versions (or more precisely, there is a workaround for the B-B bug, see the ChangeLog for details). The example files were not able to load in version 3.1.1 and msgmerge was not recognized (this is fixed, however not tested yet). There are other small but irrelevant fixes (see ChangeLog), too. RELEASE NOTES FOR XAOS VERSION 3.1.1 ------------------------------------ This release is a CVS snapshot freeze for those who are using newer systems. The most important update is a fix for gcc-3.4. There are also - improvements in French and Spanish translations, - some more example files (contributed by Zsigmond Kovács), - some fixes which patch annoying problems. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2004/07/14 21:06:57 ben Exp $ d3 134 a136 18 --- Makefile.in.orig Wed Mar 4 22:49:12 1998 +++ Makefile.in @@@@ -35,6 +35,7 @@@@ install: @@INSTALL@@ -d $(DESTDIR)$(datadir)/XaoS/doc @@INSTALL@@ -d $(DESTDIR)$(datadir)/XaoS/help @@INSTALL@@ -d $(DESTDIR)$(bindir) + @@INSTALL@@ -d $(DESTDIR)$(infodir) @@INSTALL@@ -d $(DESTDIR)$(mandir)/man6 @@INSTALL@@ -s bin/xaos $(DESTDIR)$(bindir) @@INSTALL@@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial @@@@ -43,7 +44,6 @@@@ install: @@INSTALL@@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help @@INSTALL@@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc @@INSTALL@@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 - @@STICKY@@ @@INSTALL@@ -m 444 doc/xaos.info $(DESTDIR)$(infodir) #install-info doc/xaos.info if [ "@@USE_NLS@@" = "yes" ]; then $(MAKE) -C src/i18n/ install; fi @ 1.4 log @Update of x11/XaoS to 3.1, as requested in PR#26323. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2004/03/24 11:56:00 wiz Exp $ @ 1.3 log @Never install the executable setuid root. Might have happened if libvga was found (not on NetBSD, of course). Bump PKGREVISION to 1. Closes PR 21812 by reed. @ text @d1 1 a1 1 $NetBSD$ d5 12 a16 4 @@@@ -41,7 +41,6 @@@@ install: @@INSTALL@@ -m 444 catalogs/* $(datadir)/XaoS/catalogs @@INSTALL@@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/ANNOUNCE doc/PROBLEMS doc/tutorial.txt $(datadir)/XaoS/doc @@INSTALL@@ -m 444 doc/xaos.6 $(mandir)/man6 d18 1 a18 1 @@INSTALL@@ -m 444 doc/xaos.info $(infodir) d20 1 a20 1 @ 1.2 log @Properly handle info files. Remove now unnecessary patch file. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2002/03/25 16:19:31 atatat Exp $ d3 5 a7 5 Run install-info --- Makefile.in.orig Wed Mar 4 16:49:12 1998 +++ Makefile.in Sun Mar 24 00:36:57 2002 @@@@ -43,5 +43,5 @@@@ d9 1 a9 1 @@STICKY@@ d11 1 a11 2 - #install-info doc/xaos.info + install-info --info-dir=${prefix}/info ${prefix}/info/xaos.info @ 1.1 log @Add XaoS package. This is a zoomable fractal generator (Mandelbrot and friends, as well as Newton, Barnsley, Phoenix, and Magnet), that can also be used as an external module in xscreensaver. @ text @d1 1 a1 1 $NetBSD$ @