From 28d812fa480577a779ef632f275d469e7db50449 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 23 Jun 2003 09:53:10 +0000 Subject: Update gd to 2.0.15 What's new: * Support for truecolor images * Support for alpha channels * The specialized .gd and .gd2 file formats * Documentation fixes * Bug fixes --- graphics/gd/Makefile | 27 ++---- graphics/gd/PLIST | 8 +- graphics/gd/buildlink2.mk | 8 +- graphics/gd/distinfo | 8 +- graphics/gd/patches/patch-aa | 201 ------------------------------------------- graphics/gd/patches/patch-ab | 12 --- 6 files changed, 17 insertions(+), 247 deletions(-) delete mode 100644 graphics/gd/patches/patch-aa delete mode 100644 graphics/gd/patches/patch-ab (limited to 'graphics/gd') diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index e0f620e71ec..ddb20a2c3ef 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,39 +1,22 @@ -# $NetBSD: Makefile,v 1.37 2003/06/02 01:19:29 jschauma Exp $ +# $NetBSD: Makefile,v 1.38 2003/06/23 09:53:10 adam Exp $ # -DISTNAME= gd-1.8.4 -PKGREVISION= 1 +DISTNAME= gd-2.0.15 CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ -MAINTAINER= tech-pkg@netbsd.org +MAINTAINER= adam@netbsd.org HOMEPAGE= http://www.boutell.com/gd/ COMMENT= graphics library for fast PNG creation USE_BUILDLINK2= YES USE_LIBTOOL= YES USE_X11= YES +GNU_CONFIGURE= YES REPLACE_PERL= bdftogd -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -MAKE_ENV+= EXTRA_LIBS="-lsocket -lnsl" -.endif - -CPPFLAGS+= -I${BUILDLINK_PREFIX.freetype}/include/freetype # freetype.h -CPPFLAGS+= -I${BUILDLINK_PREFIX.xpm}/include/X11 # xpm.h - -# When the API changes and breaks binary-compatibility with the previous -# version, increment the MAJOR by 1 and reset the MINOR to 0. Otherwise, -# bump the MINOR when a new version comes out. -# -GD_MAJOR= 1 -GD_MINOR= 9 -MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}" - .include "../../devel/zlib/buildlink2.mk" -.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" diff --git a/graphics/gd/PLIST b/graphics/gd/PLIST index 21c9c7c0e6d..b6e36a78bc0 100644 --- a/graphics/gd/PLIST +++ b/graphics/gd/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/06/23 09:53:10 adam Exp $ +bin/annotate bin/bdftogd bin/gd2copypal bin/gd2topng +bin/gdlib-config bin/gdparttopng bin/gdtopng bin/pngtogd @@ -18,5 +20,5 @@ include/gdfontt.h lib/libgd.a lib/libgd.la lib/libgd.so -lib/libgd.so.1 -lib/libgd.so.1.9 +lib/libgd.so.2 +lib/libgd.so.2.0 diff --git a/graphics/gd/buildlink2.mk b/graphics/gd/buildlink2.mk index 7338ae1529d..4854b96dc5f 100644 --- a/graphics/gd/buildlink2.mk +++ b/graphics/gd/buildlink2.mk @@ -1,19 +1,19 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:02 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/06/23 09:53:10 adam Exp $ .if !defined(GD_BUILDLINK2_MK) GD_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= gd -BUILDLINK_DEPENDS.gd?= gd>=1.8.4nb1 +BUILDLINK_DEPENDS.gd?= gd>=2.0.15 BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd EVAL_PREFIX+= BUILDLINK_PREFIX.gd=gd BUILDLINK_PREFIX.gd_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.gd= include/gd*.h +BUILDLINK_FILES.gd+= include/gd*.h BUILDLINK_FILES.gd+= lib/libgd.* .include "../../devel/zlib/buildlink2.mk" -.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo index 12f05584223..9b7792705df 100644 --- a/graphics/gd/distinfo +++ b/graphics/gd/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.6 2003/06/07 11:32:39 cjep Exp $ +$NetBSD: distinfo,v 1.7 2003/06/23 09:53:10 adam Exp $ -SHA1 (gd-1.8.4.tar.gz) = be8b20ca26b116a22e7a40c8a33dd54edb4a3721 -Size (gd-1.8.4.tar.gz) = 257631 bytes -SHA1 (patch-aa) = e538ee86facaf1f2b0bfdaa6fb30df64064371e6 -SHA1 (patch-ab) = 0cb9792fe542e087ef84ea731bd162e9f0bb1f39 +SHA1 (gd-2.0.15.tar.gz) = 1a6cd60030c55e71f26e2bddc6a656c928f64f24 +Size (gd-2.0.15.tar.gz) = 526904 bytes diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa deleted file mode 100644 index 84cbbbc9c72..00000000000 --- a/graphics/gd/patches/patch-aa +++ /dev/null @@ -1,201 +0,0 @@ -$NetBSD: patch-aa,v 1.15 2003/06/07 11:32:39 cjep Exp $ - ---- Makefile.orig 2001-02-22 17:03:43.000000000 +0000 -+++ Makefile -@@ -3,7 +3,8 @@ - #If you do not have gcc, change the setting for COMPILER, but you must - #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc - #compiler; get gcc if you are still using it). --COMPILER=gcc -+#COMPILER=gcc -+INS=$(LIBTOOL) $(INSTALL) -c -m - - #If the ar command fails on your system, consult the ar manpage - #for your system. -@@ -12,12 +13,11 @@ AR=ar - #If you don't have FreeType, libjpeg and/or Xpm installed, including the - #header files, uncomment this (default). You really must install - #libpng and zlib to get anywhere if you wish to create PNG images. --CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG -+#CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG - - #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a - #variation of this and comment out the line above. See also LIBS below. --#CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \ --# -DHAVE_LIBFREETYPE -DHAVE_LIBTTF -+CFLAGS+=-DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBTTF - - #To use the old FreeType 1.x library, add this additional #define - #to the line above -@@ -30,13 +30,13 @@ CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG - #Some systems are very picky about link order. They don't all agree - #on the right order, either. - --LIBS=-lgd -lpng -lz -lm -+#LIBS=-lgd -lpng -lz -lm - - #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a - #variation of this and comment out the line above. Note that - #Xpm requires X11. See also CFLAGS above. - --#LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf -+LIBS=$(LIBGD) -lpng -lz -ljpeg -lm -lttf -lintl - - #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead. - -@@ -45,7 +45,7 @@ LIBS=-lgd -lpng -lz -lm - #ensure that the version of gd you are installing is used, and not an - #older release in your directory tree somewhere. - --INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include -+INCLUDEDIRS=-I. ${CPPFLAGS} - - #Typical install locations for freetype, zlib, xpm and libpng libraries. - #If yours are somewhere else, other than a standard location -@@ -55,16 +55,16 @@ INCLUDEDIRS=-I. -I/usr/include/freetype2 - #on your system can't cause conflicts while building a new one. - #This line shouldn't hurt if you don't actually have some of the - #optional libraries and directories. --LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib -+LIBDIRS=${LDFLAGS} - - #Location where libgd.a should be installed by "make install". --INSTALL_LIB=/usr/local/lib -+INSTALL_LIB=${PREFIX}/lib - - #Location where .h files should be installed by "make install". --INSTALL_INCLUDE=/usr/local/include -+INSTALL_INCLUDE=${PREFIX}/include - - #Location where useful non-test programs should be installed by "make install". --INSTALL_BIN=/usr/local/bin -+INSTALL_BIN=${PREFIX}/bin - - # - # -@@ -74,7 +74,7 @@ INSTALL_BIN=/usr/local/bin - - VERSION=1.8.4 - --CC=$(COMPILER) $(INCLUDEDIRS) -+CC=$(LIBTOOL) $(COMPILER) $(INCLUDEDIRS) - LINK=$(CC) $(LIBDIRS) $(LIBS) - - PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) -@@ -82,75 +82,75 @@ PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS - BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng - TEST_PROGRAMS=gdtest gddemo gd2time gdtestft gdtestttf - --all: libgd.a $(PROGRAMS) -+LIBGD=libgd.la - --install: libgd.a $(BIN_PROGRAMS) -- sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a -- sh ./install-item 755 pngtogd $(INSTALL_BIN)/pngtogd -- sh ./install-item 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 -- sh ./install-item 755 gdtopng $(INSTALL_BIN)/gdtopng -- sh ./install-item 755 gd2topng $(INSTALL_BIN)/gd2topng -- sh ./install-item 755 gd2copypal $(INSTALL_BIN)/gd2copypal -- sh ./install-item 755 gdparttopng $(INSTALL_BIN)/gdparttopng -- sh ./install-item 755 webpng $(INSTALL_BIN)/webpng -- sh ./install-item 755 bdftogd $(INSTALL_BIN)/bdftogd -- sh ./install-item 644 gd.h $(INSTALL_INCLUDE)/gd.h -- sh ./install-item 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h -- sh ./install-item 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h -- sh ./install-item 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h -- sh ./install-item 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h -- sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h -- sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h -- sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h -+all: $(LIBGD) $(PROGRAMS) - --gddemo: gddemo.o libgd.a -+install: $(LIBGD) $(BIN_PROGRAMS) -+ sh $(INS) 644 $(LIBGD) $(INSTALL_LIB) -+ sh $(INS) 755 pngtogd $(INSTALL_BIN)/pngtogd -+ sh $(INS) 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 -+ sh $(INS) 755 gdtopng $(INSTALL_BIN)/gdtopng -+ sh $(INS) 755 gd2topng $(INSTALL_BIN)/gd2topng -+ sh $(INS) 755 gd2copypal $(INSTALL_BIN)/gd2copypal -+ sh $(INS) 755 gdparttopng $(INSTALL_BIN)/gdparttopng -+ sh $(INS) 755 webpng $(INSTALL_BIN)/webpng -+ sh $(INS) 755 bdftogd $(INSTALL_BIN)/bdftogd -+ sh $(INS) 644 gd.h $(INSTALL_INCLUDE)/gd.h -+ sh $(INS) 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h -+ sh $(INS) 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h -+ sh $(INS) 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h -+ sh $(INS) 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h -+ sh $(INS) 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h -+ sh $(INS) 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h -+ sh $(INS) 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h -+ -+gddemo: gddemo.o $(LIBGD) - $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) - --pngtogd: pngtogd.o libgd.a -+pngtogd: pngtogd.o $(LIBGD) - $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) - --webpng: webpng.o libgd.a -+webpng: webpng.o $(LIBGD) - $(CC) webpng.o -o webpng $(LIBDIRS) $(LIBS) - --pngtogd2: pngtogd2.o libgd.a -+pngtogd2: pngtogd2.o $(LIBGD) - $(CC) pngtogd2.o -o pngtogd2 $(LIBDIRS) $(LIBS) - --gdtopng: gdtopng.o libgd.a -+gdtopng: gdtopng.o $(LIBGD) - $(CC) gdtopng.o -o gdtopng $(LIBDIRS) $(LIBS) - --gd2topng: gd2topng.o libgd.a -+gd2topng: gd2topng.o $(LIBGD) - $(CC) gd2topng.o -o gd2topng $(LIBDIRS) $(LIBS) - --gd2copypal: gd2copypal.o libgd.a -+gd2copypal: gd2copypal.o $(LIBGD) - $(CC) gd2copypal.o -o gd2copypal $(LIBDIRS) $(LIBS) - --gdparttopng: gdparttopng.o libgd.a -+gdparttopng: gdparttopng.o $(LIBGD) - $(CC) gdparttopng.o -o gdparttopng $(LIBDIRS) $(LIBS) - --gdtest: gdtest.o libgd.a -+gdtest: gdtest.o $(LIBGD) - $(CC) gdtest.o -o gdtest $(LIBDIRS) $(LIBS) - --gd2time: gd2time.o libgd.a -+gd2time: gd2time.o $(LIBGD) - $(CC) gd2time.o -o gd2time $(LIBDIRS) $(LIBS) - --gdtestft: gdtestft.o libgd.a -+gdtestft: gdtestft.o $(LIBGD) - $(CC) --verbose gdtestft.o -o gdtestft $(LIBDIRS) $(LIBS) --gdtestttf: gdtestttf.o libgd.a -+gdtestttf: gdtestttf.o $(LIBGD) - $(CC) --verbose gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) - --libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ -+GD_OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ - gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ - gdfontg.o gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \ -- gd_wbmp.o gdhelpers.o gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \ -- gdfontg.h gdhelpers.h -- rm -f libgd.a -- $(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \ -- gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \ -- gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \ -- gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \ - gd_wbmp.o gdhelpers.o -- -ranlib libgd.a -+ -+$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \ -+ gdfontg.h gdhelpers.h -+ rm -f $(LIBGD) -+ $(CC) -o $(LIBGD) $(GD_OBJS:.o=.lo) -rpath ${PREFIX}/lib \ -+ -version-info $(GD_MAJOR):$(GD_MINOR) $(LIBDIRS) ${LIBS:C/${LIBGD}//g} - - clean: -- rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp -+ $(LIBTOOL) rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp - diff --git a/graphics/gd/patches/patch-ab b/graphics/gd/patches/patch-ab deleted file mode 100644 index 85985117ead..00000000000 --- a/graphics/gd/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2003/06/07 11:32:39 cjep Exp $ - ---- gd.h.orig 2001-02-06 19:44:01.000000000 +0000 -+++ gd.h -@@ -122,6 +122,7 @@ gdImagePtr gdImageCreateFromGd2Part(FILE - gdImagePtr gdImageCreateFromGd2PartCtx(gdIOCtxPtr in, int srcx, int srcy, int w, int h); - - gdImagePtr gdImageCreateFromXbm(FILE *fd); -+gdImagePtr gdImageCreateFromXpm(char *filename); - - void gdImageDestroy(gdImagePtr im); - void gdImageSetPixel(gdImagePtr im, int x, int y, int color); -- cgit v1.2.3