diff options
Diffstat (limited to 'www/chimera')
| -rw-r--r-- | www/chimera/Makefile | 4 | ||||
| -rw-r--r-- | www/chimera/distinfo | 6 | ||||
| -rw-r--r-- | www/chimera/patches/patch-aa | 4 | ||||
| -rw-r--r-- | www/chimera/patches/patch-ad | 31 |
4 files changed, 32 insertions, 13 deletions
diff --git a/www/chimera/Makefile b/www/chimera/Makefile index 026a984d4ca..8c9a3d05cb6 100644 --- a/www/chimera/Makefile +++ b/www/chimera/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:30 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:32 wiz Exp $ # DISTNAME= chimera-2.0a19 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= www MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera-alpha/ diff --git a/www/chimera/distinfo b/www/chimera/distinfo index f52170eca82..c3e8ef790fe 100644 --- a/www/chimera/distinfo +++ b/www/chimera/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.6 2008/04/04 13:45:02 obache Exp $ +$NetBSD: distinfo,v 1.7 2010/06/13 22:45:32 wiz Exp $ SHA1 (chimera-2.0a19.tar.gz) = c69b70b11cf12837e260eaa20e548bf9eb9ce309 RMD160 (chimera-2.0a19.tar.gz) = d3f4d2ff3328c3bf5020490ed851b281e0492fe2 Size (chimera-2.0a19.tar.gz) = 248431 bytes -SHA1 (patch-aa) = 8e1f95a295f67f7357b2eb367e24492fd2d4d467 +SHA1 (patch-aa) = fb77753229ef9f2b9ef1424818ce704cdead18e0 SHA1 (patch-ab) = 1fc2f5f97f46403359a00e42cc25f4cbf9bc5331 SHA1 (patch-ac) = 5f18afd9a1452bfba010fe3eb4e773f5395789c6 -SHA1 (patch-ad) = 400a047e978ccb0c4ebcf69a93117b4c7ecfdddb +SHA1 (patch-ad) = fcfc16397954269a8493017ca06707f043a0cf06 SHA1 (patch-ae) = 8b8e1bc50791b635e5e87860302d0e758d159ed9 SHA1 (patch-af) = 76256ccb4b5183a8d30a46a89a0cd75b113122fc diff --git a/www/chimera/patches/patch-aa b/www/chimera/patches/patch-aa index 1b116a9020b..1f53b694041 100644 --- a/www/chimera/patches/patch-aa +++ b/www/chimera/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache Exp $ +$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:32 wiz Exp $ --- Common.tmpl.dist.orig 1999-05-30 21:43:52.000000000 +0000 +++ Common.tmpl.dist @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache Exp $ -PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a -*/ +PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT) -Wl,-R$(PNGDIR)/lib -+PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a ++PNGDEPLIB = $(PNGDIR)/lib/libpng14$(IMGLEXT).a + /* Tells Imakefile to set the flags for debugging. Comment for -O. */ diff --git a/www/chimera/patches/patch-ad b/www/chimera/patches/patch-ad index 3179b09d1d1..f9077ca4c62 100644 --- a/www/chimera/patches/patch-ad +++ b/www/chimera/patches/patch-ad @@ -1,8 +1,26 @@ -$NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $ +$NetBSD: patch-ad,v 1.4 2010/06/13 22:45:32 wiz Exp $ ---- image/png.c.orig Mon Mar 29 03:23:46 1999 +--- image/png.c.orig 1999-03-29 02:23:46.000000000 +0000 +++ image/png.c -@@ -222,17 +222,11 @@ +@@ -126,7 +126,7 @@ lf_info_callback(png_struct *state, png_ + + val = 0; + for (i = 0; i < info->num_trans; ++i) { +- if (info->trans[i] < info->trans[val]) ++ if (info->trans_alpha[i] < info->trans_alpha[val]) + val = i; + } + png->image->transparent = val; +@@ -154,7 +154,7 @@ lf_info_callback(png_struct *state, png_ + png->image->rgb.used = maxval + 1; + + if (info->valid & PNG_INFO_tRNS) +- png->image->transparent = info->trans_values.gray; ++ png->image->transparent = info->trans_color.gray; + } else { + png->image = newTrueImage(info->width, info->height); + if (!png->image) { +@@ -222,17 +222,11 @@ pngDestroy(void *pointer) if (setjmp(png->state->jmpbuf)) return; @@ -22,7 +40,7 @@ $NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $ if (png->image) { freeImage(png->image); png->image = 0; -@@ -275,27 +269,21 @@ +@@ -275,28 +269,22 @@ pngInit(void (*lineProc)(void *, int, in memset(png, 0, sizeof(pngState)); png->lineProc = lineProc; png->closure = closure; @@ -49,9 +67,10 @@ $NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $ + png_destroy_read_struct(&png->state, &png->info, (png_info **)NULL); return; } -- + - png_info_init(png->info); - png_read_init(png->state); - +- png_set_progressive_read_fn(png->state, (void *) png, lf_info_callback, lf_row_callback, lf_end_callback); + png->done = image_need_data; |