From 82f31cf92066b55aaa808aa134012ebcc3353eda Mon Sep 17 00:00:00 2001 From: dholland Date: Mon, 30 Jul 2012 01:19:15 +0000 Subject: Update to 3.5. Upstream changes: - Portuguese translation - bug fixes - more examples - new documentation infrastructure --- x11/XaoS/Makefile | 9 +- x11/XaoS/PLIST | 26 ++++-- x11/XaoS/distinfo | 15 ++-- x11/XaoS/patches/patch-aa | 14 ++-- x11/XaoS/patches/patch-ab | 210 +++++++++++++++++++++++----------------------- x11/XaoS/patches/patch-ac | 15 ---- x11/XaoS/patches/patch-ad | 12 --- x11/XaoS/patches/patch-al | 13 --- 8 files changed, 142 insertions(+), 172 deletions(-) delete mode 100644 x11/XaoS/patches/patch-ac delete mode 100644 x11/XaoS/patches/patch-ad delete mode 100644 x11/XaoS/patches/patch-al (limited to 'x11') diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile index 234ba9196e2..9b9801299ee 100644 --- a/x11/XaoS/Makefile +++ b/x11/XaoS/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2012/07/29 22:13:56 dholland Exp $ +# $NetBSD: Makefile,v 1.33 2012/07/30 01:19:15 dholland Exp $ # -DISTNAME= XaoS-3.4 -PKGREVISION= 3 +DISTNAME= xaos-3.5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xaos/} @@ -16,9 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake msgfmt USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-curses-driver=no -# DGA fails to link somehow, XXX should be fixed -CONFIGURE_ARGS+= --with-dga-driver=no INFO_FILES= yes SUBST_CLASSES+= paths @@ -30,6 +26,7 @@ SUBST_SED.paths= -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g' INSTALLATION_DIRS= ${PKGINFODIR} CHECK_PORTABILITY_SKIP+= help/applehelpconv +CHECK_PORTABILITY_SKIP+= help/.svn/text-base/applehelpconv.svn-base LDFLAGS.SunOS+= -liconv diff --git a/x11/XaoS/PLIST b/x11/XaoS/PLIST index 10d24c28c9c..c6f266c6128 100644 --- a/x11/XaoS/PLIST +++ b/x11/XaoS/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:24:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2012/07/30 01:19:15 dholland Exp $ bin/xaos info/xaos.info man/man6/xaos.6 @@ -10,12 +10,15 @@ share/XaoS/catalogs/espanhol.cat share/XaoS/catalogs/francais.cat share/XaoS/catalogs/italiano.cat share/XaoS/catalogs/magyar.cat +share/XaoS/catalogs/portuguese.cat share/XaoS/catalogs/romanian.cat share/XaoS/doc/AUTHORS -share/XaoS/doc/PROBLEMS -share/XaoS/doc/README -share/XaoS/doc/README.bugs -share/XaoS/doc/compilers.txt +share/XaoS/doc/COPYING +share/XaoS/doc/ChangeLog +share/XaoS/doc/ChangeLog.old +share/XaoS/doc/INSTALL +share/XaoS/doc/NEWS +share/XaoS/doc/TODO share/XaoS/examples/0rfel1.xpf share/XaoS/examples/0rfel2.xpf share/XaoS/examples/2spirals.xpf @@ -30,6 +33,7 @@ share/XaoS/examples/3d8.xpf share/XaoS/examples/3d9.xpf share/XaoS/examples/README share/XaoS/examples/alien.xpf +share/XaoS/examples/animal.xpf share/XaoS/examples/axe.xpf share/XaoS/examples/barnsl1.xpf share/XaoS/examples/barnsl2.xpf @@ -60,6 +64,7 @@ share/XaoS/examples/edge.xpf share/XaoS/examples/edge2.xpf share/XaoS/examples/edge3.xpf share/XaoS/examples/eifell.xpf +share/XaoS/examples/eye.xpf share/XaoS/examples/eyes.xpf share/XaoS/examples/fract0.xpf share/XaoS/examples/fract1.xpf @@ -127,13 +132,18 @@ share/XaoS/examples/mand9.xpf share/XaoS/examples/mandanim.xaf share/XaoS/examples/minibrot.xpf share/XaoS/examples/nap.xpf +share/XaoS/examples/newcolor.xpf +share/XaoS/examples/newt.xpf +share/XaoS/examples/newt2.xpf share/XaoS/examples/newton.xaf share/XaoS/examples/newton.xpf share/XaoS/examples/newton2.xpf share/XaoS/examples/newton3.xpf share/XaoS/examples/octo.xpf share/XaoS/examples/orveny.xpf +share/XaoS/examples/paisleypillow.xpf share/XaoS/examples/palace.xpf +share/XaoS/examples/paramecium.xpf share/XaoS/examples/pavaszem.xpf share/XaoS/examples/pavaszem2.xpf share/XaoS/examples/pentafrac.xpf @@ -145,10 +155,14 @@ share/XaoS/examples/perb4.xpf share/XaoS/examples/perb5.xpf share/XaoS/examples/phoenix1.xpf share/XaoS/examples/phoenix2.xpf +share/XaoS/examples/pretty.xpf +share/XaoS/examples/pretty2.xpf share/XaoS/examples/redjulia.xpf share/XaoS/examples/redmand.xpf share/XaoS/examples/redmand2.xpf share/XaoS/examples/rocks.xpf +share/XaoS/examples/royal.xpf +share/XaoS/examples/rpg.xpf share/XaoS/examples/shell.xpf share/XaoS/examples/skullfrm.xpf share/XaoS/examples/something.xpf @@ -171,6 +185,7 @@ share/XaoS/examples/truecol6.xpf share/XaoS/examples/truecol7.xpf share/XaoS/examples/ufo.xpf share/XaoS/examples/warriormask.xpf +share/XaoS/examples/whisp.xpf share/XaoS/examples/zsigapro.xpf share/XaoS/help/xaos.hlp share/XaoS/tutorial/3dtutor.xaf @@ -233,4 +248,5 @@ share/locale/es/LC_MESSAGES/xaos.mo share/locale/fr/LC_MESSAGES/xaos.mo share/locale/hu/LC_MESSAGES/xaos.mo share/locale/it/LC_MESSAGES/xaos.mo +share/locale/pt/LC_MESSAGES/xaos.mo share/locale/ro/LC_MESSAGES/xaos.mo diff --git a/x11/XaoS/distinfo b/x11/XaoS/distinfo index b7ab26bdadf..557c8786a06 100644 --- a/x11/XaoS/distinfo +++ b/x11/XaoS/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.14 2011/01/29 14:42:51 wiz Exp $ +$NetBSD: distinfo,v 1.15 2012/07/30 01:19:15 dholland Exp $ -SHA1 (XaoS-3.4.tar.gz) = 4e419715ae0479fa3a20ed5f48ede7ad222f2d10 -RMD160 (XaoS-3.4.tar.gz) = 37ce4728940e80c2876792650aa656236893d5f7 -Size (XaoS-3.4.tar.gz) = 1977108 bytes -SHA1 (patch-aa) = f4327652392714bbe27e4655de40f7208a528990 -SHA1 (patch-ab) = 49d5deea7c1c620e46e98836458fad3b048d8df5 -SHA1 (patch-ac) = 98355581b4d45f927d58722cacb39ec83b7a540e -SHA1 (patch-ad) = e783ed91ba611af333256a660d537bcf77992893 -SHA1 (patch-al) = dc5adebc2220aa1f76920570d1212730adb2e7e7 +SHA1 (xaos-3.5.tar.gz) = 6d16a58187fba7276e6bd0547cc2fd6bb073b801 +RMD160 (xaos-3.5.tar.gz) = 193553818646fbf2d7c9f0c855ca3123446e16bc +Size (xaos-3.5.tar.gz) = 2930590 bytes +SHA1 (patch-aa) = fd6fee93b6591e1daee2e2a47876e66e36e68110 +SHA1 (patch-ab) = dcc67d834235b6189e9c2853943af2e78d2e5195 diff --git a/x11/XaoS/patches/patch-aa b/x11/XaoS/patches/patch-aa index 53b67b27e92..b90377e8e9b 100644 --- a/x11/XaoS/patches/patch-aa +++ b/x11/XaoS/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.3 2006/10/02 23:03:33 rillig Exp $ +$NetBSD: patch-aa,v 1.4 2012/07/30 01:19:16 dholland Exp $ Rip out the 16 bit i387 specific code. ---- src/engine/fractal.c.orig 2003-02-03 17:16:37.000000000 +0100 -+++ src/engine/fractal.c 2006-10-03 00:29:20.000000000 +0200 +--- src/engine/fractal.c.orig 2009-07-17 23:50:31.000000000 +0000 ++++ src/engine/fractal.c @@ -49,13 +49,6 @@ #include #include @@ -18,19 +18,19 @@ Rip out the 16 bit i387 specific code. #ifdef __alpha__ #ifdef __linux__ #include -@@ -382,15 +375,6 @@ make_fractalc (CONST int formula, float +@@ -357,15 +350,6 @@ fractal_context *make_fractalc(CONST int { - fractal_context *new_ctxt; + fractal_context *new_ctxt; -#ifndef __BEOS__ -#ifdef __GNUC__ -#ifdef __i386__ -#ifndef NOASSEMBLY -- _control87 (PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC); +- _control87(PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC); -#endif -#endif -#endif -#endif #ifdef __alpha__ #ifdef __linux__ - extern void ieee_set_fp_control (unsigned long); + extern void ieee_set_fp_control(unsigned long); diff --git a/x11/XaoS/patches/patch-ab b/x11/XaoS/patches/patch-ab index bd5a20f44bc..10296faa76f 100644 --- a/x11/XaoS/patches/patch-ab +++ b/x11/XaoS/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.7 2011/01/29 14:42:52 wiz Exp $ +$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 2003-02-03 16:16:46.000000000 +0000 +--- src/util/png.c.orig 2009-07-17 23:50:39.000000000 +0000 +++ src/util/png.c @@ -3,6 +3,7 @@ #include @@ -13,125 +13,125 @@ http://code.google.com/p/gnuxaos/issues/detail?id=55 #endif #include #include -@@ -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; +@@ -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_ -@@ -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"; +@@ -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); -@@ -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); +- 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); +- 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) - { + 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; + { + 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; +- 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->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; +- info_ptr->interlace_type = 0; + -+ png_write_info (png_ptr, info_ptr); ++ png_write_info(png_ptr, info_ptr); + #ifdef _undefined_ - png_set_text (png_ptr, info_ptr, comments, - sizeof (comments) / sizeof (png_text)); + 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_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); + /*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); diff --git a/x11/XaoS/patches/patch-ac b/x11/XaoS/patches/patch-ac deleted file mode 100644 index b9dca0f0406..00000000000 --- a/x11/XaoS/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2006/10/02 23:03:33 rillig Exp $ - ---- src/ui/ui.c.orig 2006-07-09 10:47:42.000000000 +0200 -+++ src/ui/ui.c 2006-10-03 00:46:05.000000000 +0200 -@@ -176,6 +176,10 @@ main_loop (void) - {NULL, 0, NULL, NULL} - }; - -+ -+static void ui_mkimages (int, int); -+static void main_loop (void); -+ - static int resizeregistered = 0; - static void - ui_updatemenus (uih_context * c, CONST char *name) diff --git a/x11/XaoS/patches/patch-ad b/x11/XaoS/patches/patch-ad deleted file mode 100644 index 5bb2de8023d..00000000000 --- a/x11/XaoS/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/04/08 05:02:39 jlam Exp $ - ---- src/Makefile.in.orig 2003-02-10 17:42:28.000000000 -0500 -+++ src/Makefile.in -@@ -1,6 +1,6 @@ - CC = @CC@ - CFLAGS = @CFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ @INTLLIBS@ - LFLAGS = @LDFLAGS@ - AR = @AR@ - RANLIB = @RANLIB@ diff --git a/x11/XaoS/patches/patch-al b/x11/XaoS/patches/patch-al deleted file mode 100644 index 7a2a59da0c8..00000000000 --- a/x11/XaoS/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2006/10/02 23:03:54 rillig Exp $ - ---- configure.orig 2006-10-03 00:48:30.000000000 +0200 -+++ configure 2006-10-03 00:48:44.000000000 +0200 -@@ -12861,7 +12861,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - LIBS="$LIBS -lgame -lmedia -ltracker -ltranslation -Xlinker -soname=_APP_" - #PROG_CC_SWITCH2(Wno-multichar,nowarnopt1) - #PROG_CC_SWITCH2(Wno-ctor-dtor-privacy,nowarnopt2) -- if test "$CXXFLAGS1" == "" ; then -+ if test "$CXXFLAGS1" = "" ; then - if test x$GCC = xyes; then - CXXFLAGS="$CFLAGS" - CXXFLAGS="$CXXFLAGS -Wno-multichar -Wno-ctor-dtor-privacy" -- cgit v1.2.3