diff options
author | wiz <wiz@pkgsrc.org> | 2006-04-19 19:21:28 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2006-04-19 19:21:28 +0000 |
commit | f70078701fe02b51e871e3cceb19429c57244538 (patch) | |
tree | a58f1ee61973ecca44b556671a9b004474f48db3 | |
parent | 60a1009f11a490076772295c92f205ae06c7a5d0 (diff) | |
download | pkgsrc-f70078701fe02b51e871e3cceb19429c57244538.tar.gz |
Fix build after png-1.2.9nb2 update. Bump PKGREVISION.
-rw-r--r-- | www/mMosaic/Makefile | 4 | ||||
-rw-r--r-- | www/mMosaic/distinfo | 5 | ||||
-rw-r--r-- | www/mMosaic/patches/patch-aa | 6 | ||||
-rw-r--r-- | www/mMosaic/patches/patch-ai | 78 |
4 files changed, 86 insertions, 7 deletions
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile index 1d3504c6178..504880003c8 100644 --- a/www/mMosaic/Makefile +++ b/www/mMosaic/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:52 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2006/04/19 19:21:28 wiz Exp $ # DISTNAME= mMosaic-3.7.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www MASTER_SITES= ftp://ftp.enst.fr/pub/mbone/mMosaic/ diff --git a/www/mMosaic/distinfo b/www/mMosaic/distinfo index dbf872bbb30..5d178855f65 100644 --- a/www/mMosaic/distinfo +++ b/www/mMosaic/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.6 2006/01/19 22:44:27 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/04/19 19:21:28 wiz Exp $ SHA1 (mMosaic-3.7.2.tar.gz) = f26d4fd115a0fb7fc09947506b59e1a3790b6ac7 RMD160 (mMosaic-3.7.2.tar.gz) = 9c7f2e2f00beaef474e53e25a91aeb604584dd06 Size (mMosaic-3.7.2.tar.gz) = 507612 bytes -SHA1 (patch-aa) = c18e1cc90ea3a3843c514944c8c597d660555387 +SHA1 (patch-aa) = ad7d97c9c0c7edda1aab5dc4413e43bde114f031 SHA1 (patch-ab) = 64cb25fda5e4100251072184dec9f50e8de4be97 SHA1 (patch-ac) = 98479482a48a19b3f64ce4ed7a33cec04c90d070 SHA1 (patch-ad) = 995b630412892a2a7bd32da3d95c2ecd31e9a71d SHA1 (patch-ae) = 41eb6cccefb77f720bba0885993c453bc25dc14e SHA1 (patch-af) = 0cba2c49579f6631d7e7d4f1068c00c22401d879 SHA1 (patch-ag) = 51a1021eda3d92bc8bea7dacda510b24ee8ae7ef +SHA1 (patch-ai) = 990bfbd0181fa93a53de7aaa9a98e5e954e72813 diff --git a/www/mMosaic/patches/patch-aa b/www/mMosaic/patches/patch-aa index c72d78da389..20a42e8cf07 100644 --- a/www/mMosaic/patches/patch-aa +++ b/www/mMosaic/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2005/03/06 16:56:17 fredb Exp $ +$NetBSD: patch-aa,v 1.5 2006/04/19 19:21:28 wiz Exp $ ---- Makefile.orig 2001-02-01 07:27:30.000000000 -0600 +--- Makefile.orig 2001-02-01 14:27:30.000000000 +0100 +++ Makefile @@ -45,13 +45,13 @@ CC = cc # GCC : Linux Intel optimised @@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.4 2005/03/06 16:56:17 fredb Exp $ +#pnginc = /usr/local/include +#pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a +pnginc = ${LOCALBASE}/include -+pnglibs = -lpng -lz -Wl,-R${LOCALBASE}/lib ++pnglibs = `libpng-config --ldflags` # To disable PNG support comment this. diff --git a/www/mMosaic/patches/patch-ai b/www/mMosaic/patches/patch-ai new file mode 100644 index 00000000000..516e970e07d --- /dev/null +++ b/www/mMosaic/patches/patch-ai @@ -0,0 +1,78 @@ +$NetBSD: patch-ai,v 1.1 2006/04/19 19:21:28 wiz Exp $ + +--- src/readPNG.c.orig 2000-12-08 19:00:45.000000000 +0100 ++++ src/readPNG.c +@@ -35,8 +35,8 @@ unsigned char * ReadPNG(FILE *infile,int + unsigned char *pixmap; + unsigned char *p; + png_byte *q; +- png_struct *png_ptr; +- png_info *info_ptr; ++ png_structp png_ptr; ++ png_infop info_ptr; + double screen_gamma; + png_byte *png_pixels=NULL, **row_pointers=NULL; + int i, j; +@@ -60,14 +60,16 @@ unsigned char * ReadPNG(FILE *infile,int + rewind(infile); + + /* allocate the structures */ +- png_ptr = (png_struct *)calloc(1,sizeof(png_struct)); +- if(!png_ptr) +- return 0; +- +- info_ptr = (png_info *)calloc(1,sizeof(png_info)); +- if(!info_ptr) { +- free(png_ptr); +- return 0; ++ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, ++ NULL, NULL, NULL); ++ if (!png_ptr) ++ return (0); ++ ++ info_ptr = png_create_info_struct(png_ptr); ++ if (!info_ptr) { ++ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, ++ (png_infopp)NULL); ++ return (0); + } + + /* Establish the setjmp return context for png_error to use. */ +@@ -76,24 +78,18 @@ unsigned char * ReadPNG(FILE *infile,int + if (mMosaicSrcTrace) { + fprintf(stderr, "\n!!!libpng read error!!!\n"); + } +- png_read_destroy(png_ptr, info_ptr, (png_info *)0); ++ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + + if(png_pixels != NULL) + free((char *)png_pixels); + if(row_pointers != NULL) + free((png_byte **)row_pointers); +- free((char *)png_ptr); +- free((char *)info_ptr); + return 0; + } + + /* SWP -- Hopefully to fix cores on bad PNG files */ + /*####png_set_message_fn(png_ptr,png_get_msg_ptr(png_ptr),NULL,NULL); */ + +- /* initialize the structures */ +- png_info_init(info_ptr); +- png_read_init(png_ptr); +- + /* set up the input control */ + png_init_io(png_ptr, infile); + +@@ -283,10 +279,7 @@ pixmap, since I don't do anything with i + } + free((png_byte **)row_pointers); + /* clean up after the read, and free any memory allocated */ +- png_read_destroy(png_ptr, info_ptr, (png_info *)0); +-/* free the structures */ +- free((char *)png_ptr); +- free((char *)info_ptr); ++ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + return pixmap; + } + #endif |