From 9435903dd9ff6564b75c0d1d9efbafd9771dfbe8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 14 Nov 2004 08:25:54 +0000 Subject: [PATCH] Version bump. --- dev-perl/GD/ChangeLog | 9 +- dev-perl/GD/GD-2.12.ebuild | 52 -- dev-perl/GD/GD-2.16.ebuild | 4 +- dev-perl/GD/GD-2.18.ebuild | 34 ++ dev-perl/GD/Manifest | 16 +- dev-perl/GD/files/2.12-gif-support.patch | 544 --------------------- dev-perl/GD/files/2.12-makefile-opts.patch | 40 -- dev-perl/GD/files/digest-GD-2.12 | 1 - dev-perl/GD/files/digest-GD-2.18 | 1 + 9 files changed, 52 insertions(+), 649 deletions(-) delete mode 100644 dev-perl/GD/GD-2.12.ebuild create mode 100644 dev-perl/GD/GD-2.18.ebuild delete mode 100644 dev-perl/GD/files/2.12-gif-support.patch delete mode 100644 dev-perl/GD/files/2.12-makefile-opts.patch delete mode 100644 dev-perl/GD/files/digest-GD-2.12 create mode 100644 dev-perl/GD/files/digest-GD-2.18 diff --git a/dev-perl/GD/ChangeLog b/dev-perl/GD/ChangeLog index 71d149517f14..c53337f55cde 100644 --- a/dev-perl/GD/ChangeLog +++ b/dev-perl/GD/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-perl/GD # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.25 2004/11/01 02:10:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.26 2004/11/14 08:25:54 vapier Exp $ + +*GD-2.18 (14 Nov 2004) + + 14 Nov 2004; Mike Frysinger + -files/2.12-gif-support.patch, -files/2.12-makefile-opts.patch, + -GD-2.12.ebuild, GD-2.16.ebuild, +GD-2.18.ebuild: + Version bump. *GD-2.16 (31 Oct 2004) diff --git a/dev-perl/GD/GD-2.12.ebuild b/dev-perl/GD/GD-2.12.ebuild deleted file mode 100644 index 52e70009d0d5..000000000000 --- a/dev-perl/GD/GD-2.12.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.12.ebuild,v 1.5 2004/11/01 01:46:16 vapier Exp $ - -inherit eutils perl-module - -DESCRIPTION="interface to Thomas Boutell's gd library" -HOMEPAGE="http://www.cpan.org/modules/by-module/GD/${P}.readme" -SRC_URI="http://www.cpan.org/modules/by-module/GD/${P}.tar.gz" - -LICENSE="|| ( Artistic GPL-2 )" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86" -IUSE="jpeg truetype X gif" - -DEPEND=">=media-libs/gd-2.0.5 - media-libs/libpng - sys-libs/zlib - jpeg? ( media-libs/jpeg ) - truetype? ( =media-libs/freetype-2* ) - X? ( virtual/x11 ) - gif? ( media-libs/giflib )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PV}-makefile-opts.patch - use gif && epatch ${FILESDIR}/${PV}-gif-support.patch - - use jpeg \ - && jpeg=1 \ - || jpeg=0 - - use truetype \ - && freetype=1 \ - || freetype=0 - - use X \ - && x=1 \ - || x=0 - - cp Makefile.PL{,.orig} - sed \ - -e "s:GENTOO_JPEG:${jpeg}:" \ - -e "s:GENTOO_FREETYPE:${freetype}:" \ - -e "s:GENTOO_XPM:${x}:" \ - Makefile.PL.orig > Makefile.PL - - perl-module_src_prep -} - -mydoc="GD.html" diff --git a/dev-perl/GD/GD-2.16.ebuild b/dev-perl/GD/GD-2.16.ebuild index 7e3792d16db0..52f15b956532 100644 --- a/dev-perl/GD/GD-2.16.ebuild +++ b/dev-perl/GD/GD-2.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.16.ebuild,v 1.1 2004/11/01 02:10:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.16.ebuild,v 1.2 2004/11/14 08:25:54 vapier Exp $ inherit eutils perl-module @@ -10,7 +10,7 @@ SRC_URI="http://www.cpan.org/modules/by-module/GD/${P}.tar.gz" LICENSE="|| ( Artistic GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86" IUSE="jpeg truetype X gif png" DEPEND=">=media-libs/gd-2.0.12 diff --git a/dev-perl/GD/GD-2.18.ebuild b/dev-perl/GD/GD-2.18.ebuild new file mode 100644 index 000000000000..f832eb3b14ec --- /dev/null +++ b/dev-perl/GD/GD-2.18.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.18.ebuild,v 1.1 2004/11/14 08:25:54 vapier Exp $ + +inherit eutils perl-module + +DESCRIPTION="interface to Thomas Boutell's gd library" +HOMEPAGE="http://www.cpan.org/modules/by-module/GD/${P}.readme" +SRC_URI="http://www.cpan.org/modules/by-module/GD/${P}.tar.gz" + +LICENSE="|| ( Artistic GPL-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +IUSE="jpeg truetype X gif png" + +DEPEND=">=media-libs/gd-2.0.12 + png? ( media-libs/libpng sys-libs/zlib ) + jpeg? ( media-libs/jpeg ) + truetype? ( =media-libs/freetype-2* ) + X? ( virtual/x11 ) + gif? ( media-libs/giflib )" + +src_compile() { + myconf="" + use jpeg && myconf="${myconf},JPEG" + use truetype && myconf="${myconf},FREETYPE" + use png && myconf="${myconf},PNG" + use X && myconf="${myconf},XPM" + use gif && myconf="${myconf},GIF" + myconf="-options \"${myconf:1}\"" + perl-module_src_compile +} + +mydoc="GD.html" diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest index c6571ec7ef1c..e0dae50b01b9 100644 --- a/dev-perl/GD/Manifest +++ b/dev-perl/GD/Manifest @@ -1,18 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0ab34e250b08ab909938a30792f62210 ChangeLog 3284 -MD5 5a339d80f4211b47e14760803e70a555 GD-2.16.ebuild 1033 +MD5 cc05f5a3dc7f4d73df9e7a6b171910e6 ChangeLog 3493 +MD5 5d48363ad8ffa0c9d032340c063b7b29 GD-2.18.ebuild 1033 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 -MD5 3414eaaf55c99db12b57eb31924d007e GD-2.12.ebuild 1186 +MD5 398dcdfffd76247a6064f4040c6d2060 GD-2.16.ebuild 1025 +MD5 bd3e19a13bb8c76bb7f988d048b6bd95 files/digest-GD-2.18 59 MD5 6de948299056cc91cace53859a8f0c7e files/digest-GD-2.16 59 -MD5 b51ab87c113e42bd5560824fc63bc2bc files/2.12-gif-support.patch 21921 -MD5 7eb7412d4e5148d2fda9df7bb29eae59 files/digest-GD-2.12 59 -MD5 d3ec1d86076b989f9b63c3f04270a3f6 files/2.12-makefile-opts.patch 1743 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBiCkgHTu7gpaalycRAoarAJ4+be3Wa1ezzfyt6kc7vWQlHMAeuQCg62aY -h4/0w69cMgHmZTyV8Cui2ZM= -=FWGR +iD8DBQFBlxa/HTu7gpaalycRAo0uAKDze6IML64xh3hRLZDYU74pImpF+ACfWEkc +7RmMQwCsnBhusPmZ2cVwURY= +=vEcF -----END PGP SIGNATURE----- diff --git a/dev-perl/GD/files/2.12-gif-support.patch b/dev-perl/GD/files/2.12-gif-support.patch deleted file mode 100644 index 279840357a6a..000000000000 --- a/dev-perl/GD/files/2.12-gif-support.patch +++ /dev/null @@ -1,544 +0,0 @@ -diff -Naurp GD-2.05.orig/GD.pm GD-2.05/GD.pm ---- GD-2.05.orig/GD.pm 2002-11-24 20:27:31.000000000 -0500 -+++ GD-2.05/GD.pm 2003-01-06 17:07:02.000000000 -0500 -@@ -166,6 +166,15 @@ sub GD::Image::newFromPng { - $class->_newFromPng($fh,@_); - } - -+sub GD::Image::newFromGif { -+ croak("Usage: newFromGid(class,filehandle)") unless @_==2; -+ my($class) = shift; -+ my($f) = shift; -+ my $fh = $class->_make_filehandle($f); -+ binmode($fh); -+ $class->_newFromGif($fh); -+} -+ - sub GD::Image::newFromJpeg { - croak("Usage: newFromJpeg(class,filehandle,[truecolor])") unless @_>=2; - my($class) = shift; -@@ -211,6 +220,7 @@ sub _image_type { - my $data = shift; - my $magic = substr($data,0,4); - return 'Png' if $magic eq "\x89PNG"; -+ return 'Gif' if $magic eq "GIF8"; - return 'Jpeg' if $magic eq "\377\330\377\340"; - return 'Jpeg' if $magic eq "\377\330\377\356"; - return 'Gd2' if $magic eq "gd2\000"; -@@ -617,6 +627,14 @@ you can call the image query methods des - The newFromPngData() method will create a new GD::Image initialized - with the PNG format B contained in C<$data>. - -+=item B<$image = GD::Image-EnewFromGif($file)> -+ -+=item B<$image = GD::Image-EnewFromGifData($data)> -+ -+These methods will create an image from a GIF file. They work just -+like newFromPng() and newFromPngData(), and will accept the same -+filehandle and pathname arguments. -+ - =item B<$image = GD::Image-EnewFromJpeg($file, [$truecolor])> - - =item B<$image = GD::Image-EnewFromJpegData($data, [$truecolor])> -@@ -745,6 +763,10 @@ pipe it to a display program, or write i - Same as gd(), except that it returns the data in compressed GD2 - format. - -+=item B<$gifdata = $image-Egif> -+ -+Same as gd(), except that it returns the data in GIF format. -+ - =item B<$wbmpdata = $image-Ewbmp([$foreground])> - - This returns the image data in WBMP format, which is a black-and-white -diff -Naurp GD-2.05.orig/GD.xs GD-2.05/GD.xs ---- GD-2.05.orig/GD.xs 2002-11-22 14:20:54.000000000 -0500 -+++ GD-2.05/GD.xs 2003-01-06 17:07:02.000000000 -0500 -@@ -251,6 +251,7 @@ extern gdFontPtr gdFontTiny; - #ifdef PERL_OBJECT - # ifdef WIN32 - #define GDIMAGECREATEFROMPNG(x) gdImageCreateFromPng((FILE*)x) -+#define GDIMAGECREATEFROMGIF(x) gdImageCreateFromGif((FILE*)x) - #define GDIMAGECREATEFROMXBM(x) gdImageCreateFromXbm((FILE*)x) - #define GDIMAGECREATEFROMJPEG(x) gdImageCreateFromJpeg((FILE*)x) - #define GDIMAGECREATEFROMWBMP(x) gdImageCreateFromWBMP((FILE*)x) -@@ -261,6 +262,7 @@ extern gdFontPtr gdFontTiny; - #else - # ifdef USE_PERLIO - #define GDIMAGECREATEFROMPNG(x) gdImageCreateFromPng(PerlIO_findFILE(x)) -+#define GDIMAGECREATEFROMGIF(x) gdImageCreateFromGif(PerlIO_findFILE(x)) - #define GDIMAGECREATEFROMXBM(x) gdImageCreateFromXbm(PerlIO_findFILE(x)) - #define GDIMAGECREATEFROMJPEG(x) gdImageCreateFromJpeg(PerlIO_findFILE(x)) - #define GDIMAGECREATEFROMWBMP(x) gdImageCreateFromWBMP(PerlIO_findFILE(x)) -@@ -269,6 +271,7 @@ extern gdFontPtr gdFontTiny; - #define GDIMAGECREATEFROMGD2PART(x,a,b,c,d) gdImageCreateFromGd2Part(PerlIO_findFILE(x),a,b,c,d) - # else - #define GDIMAGECREATEFROMPNG(x) gdImageCreateFromPng(x) -+#define GDIMAGECREATEFROMGIF(x) gdImageCreateFromGif(x) - #define GDIMAGECREATEFROMXBM(x) gdImageCreateFromXbm(x) - #define GDIMAGECREATEFROMJPEG(x) gdImageCreateFromJpeg(x) - #define GDIMAGECREATEFROMWBMP(x) gdImageCreateFromWBMP(x) -@@ -503,6 +506,23 @@ gdnewFromPngData(packname="GD::Image", i - RETVAL - - GD::Image -+gdnewFromGifData(packname="GD::Image", imageData, ...) -+ char * packname -+ SV * imageData -+ PROTOTYPE: $$;$ -+ PREINIT: -+ gdIOCtx* ctx; -+ char* data; -+ STRLEN len; -+ CODE: -+ data = SvPV(imageData,len); -+ ctx = newDynamicCtx(data,len); -+ RETVAL = (GD__Image) gdImageCreateFromGifCtx(ctx); -+ (ctx->gd_free)(ctx); -+ OUTPUT: -+ RETVAL -+ -+GD::Image - gdnewFromGdData(packname="GD::Image", imageData) - char * packname - SV * imageData -@@ -604,6 +624,16 @@ gd_newFromGd(packname="GD::Image", fileh - RETVAL - - GD::Image -+gd_newFromGif(packname="GD::Image", filehandle) -+ char * packname -+ InputStream filehandle -+ PROTOTYPE: $$ -+ CODE: -+ RETVAL = GDIMAGECREATEFROMGIF(filehandle); -+ OUTPUT: -+ RETVAL -+ -+GD::Image - gd_newFromGd2(packname="GD::Image", filehandle) - char * packname - InputStream filehandle -@@ -810,6 +840,21 @@ gdgd2(image) - OUTPUT: - RETVAL - -+SV* -+gdgif(image) -+ GD::Image image -+ PROTOTYPE: $ -+ CODE: -+ { -+ void* data; -+ int size; -+ data = gdImageGifPtr(image,&size); -+ RETVAL = newSVpv((char*) data,size); -+ gdFree(data); -+ } -+ OUTPUT: -+ RETVAL -+ - int - gdtransparent(image, ...) - GD::Image image -diff -Naurp GD-2.05.orig/t/GD.t GD-2.05/t/GD.t ---- GD-2.05.orig/t/GD.t 2002-11-22 15:30:06.000000000 -0500 -+++ GD-2.05/t/GD.t 2003-01-06 17:07:02.000000000 -0500 -@@ -7,7 +7,7 @@ use constant FONT=>"$Bin/Generic.ttf"; - use constant SKIP_TEST_8 => 1; - - my $loaded; --BEGIN {$| = 1; $loaded = 0; print "1..10\n"; } -+BEGIN {$| = 1; $loaded = 0; print "1..11\n"; } - END {print "not ok 1\n" unless $loaded;} - - use GD qw(:DEFAULT GD_CMP_IMAGE); -@@ -29,6 +29,7 @@ if (defined $arg && $arg eq '--write') { - compare(&test8,8,'write'); - compare(&test9('frog.xpm'),9,'write'); - compare(&test10('frog.jpg'),10,'write'); -+ compare(&test11('frog.gif'),11,'write'); - } - - compare(test2(),2); -@@ -65,6 +66,14 @@ if (GD::Image->newFromJpeg('frog.jpg')) - print "not ok ",10,"\n"; - } - -+if (GD::Image->newFromGif('frog.gif')) { -+ compare(test11('frog.gif'),11); -+} elsif ($@ =~/not built with gif support/) { -+ print "ok ",11," # Skip, no GIF support\n"; -+} else { -+ print "not ok ",11,"\n"; -+} -+ - sub compare { - my($imageData,$testNo,$fht) = @_; - local($/); -@@ -298,6 +307,6 @@ sub test10 { - sub test11 { - my $fn = shift; - my $im = GD::Image->newFromGif($fn); -- $im->gif; -+ $im->png; - } - -diff -Naurp GD-2.05.orig/t/GD.t~ GD-2.05/t/GD.t~ ---- GD-2.05.orig/t/GD.t~ 1969-12-31 19:00:00.000000000 -0500 -+++ GD-2.05/t/GD.t~ 2002-11-22 15:30:06.000000000 -0500 -@@ -0,0 +1,303 @@ -+#!/usr/bin/perl -w -+ -+use lib './blib/lib','./blib/arch','../blib/lib','../blib/arch'; -+use FileHandle; -+use FindBin qw($Bin); -+use constant FONT=>"$Bin/Generic.ttf"; -+use constant SKIP_TEST_8 => 1; -+ -+my $loaded; -+BEGIN {$| = 1; $loaded = 0; print "1..10\n"; } -+END {print "not ok 1\n" unless $loaded;} -+ -+use GD qw(:DEFAULT GD_CMP_IMAGE); -+$loaded++; -+print "ok 1\n"; -+ -+chdir 't' || die "Couldn't change to 't' directory: $!"; -+ -+$arg = shift; -+ -+if (defined $arg && $arg eq '--write') { -+ warn "Writing regression files..."; -+ compare(&test2,2,'write'); -+ compare(&test3,3,'write'); -+ compare(&test4,4,'write'); -+ compare(&test5,5,'write'); -+ compare(&test6,6,'write'); -+ compare(&test7,7,'write'); -+ compare(&test8,8,'write'); -+ compare(&test9('frog.xpm'),9,'write'); -+ compare(&test10('frog.jpg'),10,'write'); -+} -+ -+compare(test2(),2); -+compare(test3(),3); -+compare(test4(),4); -+compare(test5(),5); -+compare(test6(),6); -+compare(test7(),7); -+ -+if (SKIP_TEST_8) { -+ print "ok 8 # Skip, FreeType changes too frequently to be testable\n"; -+} -+elsif (GD::Image->stringTTF(0,FONT,12.0,0.0,20,20,"Hello world!")) { -+ multicompare(test8(),8,undef); -+} elsif ($@ =~/not built with .+Type font support/) { -+ print "ok ",8," # Skip, no FreeType font support\n"; -+} else { -+ print "not ok ",8,"\n"; -+} -+ -+if (GD::Image->newFromXpm('frog.xpm')) { -+ compare(test9('frog.xpm'),9); -+} elsif ($@ =~/not built with xpm support/) { -+ print "ok ",9," # Skip, no XPM support\n"; -+} else { -+ print "not ok ",9,"\n"; -+} -+ -+if (GD::Image->newFromJpeg('frog.jpg')) { -+ compare(test10('frog.jpg'),10); -+} elsif ($@ =~/not built with jpeg support/) { -+ print "ok ",10," # Skip, no JPEG support\n"; -+} else { -+ print "not ok ",10,"\n"; -+} -+ -+sub compare { -+ my($imageData,$testNo,$fht) = @_; -+ local($/); -+ undef $/; -+ my $ok = $testNo; -+ my $regressdata; -+ my $file = ($^O eq 'VMS')? "test.out_".$testNo."_png" : "./test.out.$testNo.png"; -+ if (defined $fht and $fht eq 'write') { -+ open (REGRESSFILE,">$file") -+ || die "Can't open regression file '$file': $!\n"; -+ binmode REGRESSFILE; -+ print REGRESSFILE $imageData; -+ close REGRESSFILE; -+ } else { -+ open (REGRESSFILE,"./$file") -+ || die "Can't open regression file './t/$file': $!\n"; -+ binmode REGRESSFILE; -+ $regressdata = ; -+ close REGRESSFILE; -+ print $imageData eq $regressdata ? "ok $ok" : "not ok $ok","\n"; -+ } -+} -+ -+sub multicompare { -+ my($imageData,$testNo,$fht,@alt) = @_; -+ local $/ = undef; -+ my $ok = $testNo; -+ my $regressdata; -+ my $file = ($^O eq 'VMS')? "test.out_".$testNo."_png" : "test.out.$testNo.png"; -+ if (defined $fht and $fht eq 'write') { -+ die "Not implemented with multicompare"; -+ } else { -+ my $equal; -+ opendir(DIR,'.'); -+ ENTRY: -+ while (my $entry =readdir(DIR)) { -+ next unless $entry =~ /^$file(-\d+)?/; -+ open (REGRESSFILE,$entry) -+ || die "Can't open regression file './t/$entry': $!\n"; -+ binmode REGRESSFILE; -+ $regressdata = ; -+ close REGRESSFILE; -+ if ($imageData eq $regressdata) { -+ $equal = 1; -+ last ENTRY; -+ } -+ } -+ closedir DIR; -+ print $equal ? "ok $ok" : "not ok $ok","\n"; -+ } -+} -+ -+sub test2 { -+ my($im) = new GD::Image(300,300); -+ my($white) = $im->colorAllocate(255, 255, 255); -+ my($black) = $im->colorAllocate(0, 0, 0); -+ my($red) = $im->colorAllocate(255, 0, 0); -+ my($green) = $im->colorAllocate(0,255,0); -+ my($yellow) = $im->colorAllocate(255,250,205); -+ open (TILE,"./tile.png") || die "Can't open tile file: $!"; -+ my($tile) = newFromPng GD::Image(TILE); -+ close TILE; -+ $im->setBrush($tile); -+ $im->arc(100,100,100,150,0,360,gdBrushed); -+ $im->setTile($tile); -+ $im->filledRectangle(150,150,250,250,gdTiled); -+ $im->rectangle(150,150,250,250,$black); -+ $im->setStyle($green,$green,$green,gdTransparent,$red,$red,$red,gdTransparent); -+ $im->line(0,280,300,280,gdStyled); -+ return $im->png; -+} -+ -+sub test3 { -+ my($im) = new GD::Image(300,300); -+ my($white,$black,$red,$blue,$yellow) = ( -+ $im->colorAllocate(255, 255, 255), -+ $im->colorAllocate(0, 0, 0), -+ $im->colorAllocate(255, 0, 0), -+ $im->colorAllocate(0,0,255), -+ $im->colorAllocate(255,250,205) -+ ); -+ my($brush) = new GD::Image(10,10); -+ $brush->colorAllocate(255,255,255); # white -+ $brush->colorAllocate(0,0,0); # black -+ $brush->transparent($white); # white is transparent -+ $brush->filledRectangle(0,0,5,2,$black); # a black rectangle -+ $im->setBrush($brush); -+ $im->arc(100,100,100,150,0,360,gdBrushed); -+ my($poly) = new GD::Polygon; -+ $poly->addPt(30,30); -+ $poly->addPt(100,10); -+ $poly->addPt(190,290); -+ $poly->addPt(30,290); -+ $im->polygon($poly,gdBrushed); -+ $im->fill(132,62,$blue); -+ $im->fill(100,70,$red); -+ $im->fill(40,40,$yellow); -+ $im->interlaced(1); -+ $im->copy($im,150,150,20,20,50,50); -+ $im->copyResized($im,10,200,20,20,100,100,50,50); -+ return $im->png; -+} -+ -+sub test4 { -+ my($im) = new GD::Image(100,50); -+ my($black,$white,$red,$blue) = -+ ( -+ $im->colorAllocate(0, 0, 0), -+ $im->colorAllocate(255, 255, 255), -+ $im->colorAllocate(255, 0, 0), -+ $im->colorAllocate(0,0,255) -+ ); -+ $im->arc(50, 25, 98, 48, 0, 360, $white); -+ $im->fill(50, 21, $red); -+ return $im->png; -+} -+ -+sub test5 { -+ my($im) = new GD::Image(225,180); -+ my($black,$white,$red,$blue,$yellow) = -+ ($im->colorAllocate(0, 0, 0), -+ $im->colorAllocate(255, 255, 255), -+ $im->colorAllocate(255, 0, 0), -+ $im->colorAllocate(0,0,255), -+ $im->colorAllocate(255,250,205) -+ ); -+ my($poly) = new GD::Polygon; -+ $poly->addPt(0,50); -+ $poly->addPt(25,25); -+ $poly->addPt(50,50); -+ $im->filledPolygon($poly,$blue); -+ $poly->offset(100,100); -+ $im->filledPolygon($poly,$red); -+ $poly->map(50,50,100,100,10,10,110,60); -+ $im->filledPolygon($poly,$yellow); -+ $poly->map($poly->bounds,50,20,80,160); -+ $im->filledPolygon($poly,$white); -+ return $im->png; -+} -+ -+sub test6 { -+ my($im) = new GD::Image(300,300); -+ my($white,$black,$red,$blue,$yellow) = -+ ( -+ $im->colorAllocate(255, 255, 255), -+ $im->colorAllocate(0, 0, 0), -+ $im->colorAllocate(255, 0, 0), -+ $im->colorAllocate(0,0,255), -+ $im->colorAllocate(255,250,205) -+ ); -+ $im->transparent($white); -+ $im->interlaced(1); -+ my($brush) = new GD::Image(10,10); -+ $brush->colorAllocate(255,255,255); -+ $brush->colorAllocate(0,0,0); -+ $brush->transparent($white); -+ $brush->filledRectangle(0,0,5,2,$black); -+ $im->string(gdLargeFont,150,10,"Hello world!",$red); -+ $im->string(gdSmallFont,150,28,"Goodbye cruel world!",$blue); -+ $im->stringUp(gdTinyFont,280,250,"I'm climbing the wall!",$black); -+ $im->charUp(gdMediumBoldFont,280,280,"Q",$black); -+ $im->setBrush($brush); -+ $im->arc(100,100,100,150,0,360,gdBrushed); -+ $poly = new GD::Polygon; -+ $poly->addPt(30,30); -+ $poly->addPt(100,10); -+ $poly->addPt(190,290); -+ $poly->addPt(30,290); -+ $im->polygon($poly,gdBrushed); -+ $im->fill(132,62,$blue); -+ $im->fill(100,70,$red); -+ $im->fill(40,40,$yellow); -+ return $im->png; -+} -+ -+sub test7 { -+ my $dtor = 0.0174533; -+ my $pi = 3.141592654; -+ my $xsize = 500; my $ysize = 500; my $scale = 1; -+ my $x_offset = $xsize/2; my $y_offset = $ysize/2; -+ my $im = new GD::Image($xsize,$ysize); -+ my $poly = new GD::Polygon; -+ my $col_bg = $im->colorAllocate(0,0,0); -+ my $col_fg = $im->colorAllocate(255,255,0); -+ my $col_fill = $im->colorAllocate(255,0,0); -+ my $r_0 = 100; my $theta_0 = 20; my $spring_factor = 30; -+ for($theta=0;$theta<=360;$theta++) { -+ my $r = $r_0 + $spring_factor*sin(2*$pi*$theta/$theta_0); -+ my $x = int($r * cos($theta*$dtor))*$scale+$x_offset; -+ my $y = int($r * sin($theta*$dtor))*$scale+$y_offset; -+ $poly->addPt($x,$y); -+ } -+ -+ $im->filledPolygon($poly,$col_fill); # Call gdImageFilledPolygon() -+ -+ return $im->png; -+} -+ -+sub test8 { -+ my $im = GD::Image->new(400,250); -+ if (!$im) { printf("Test7: no image");}; -+ my($white,$black,$red,$blue,$yellow) = -+ ( -+ $im->colorAllocate(255, 255, 255), -+ $im->colorAllocate(0, 0, 0), -+ $im->colorAllocate(255, 0, 0), -+ $im->colorAllocate(0,0,255), -+ $im->colorAllocate(255,250,205) -+ ); -+ -+ # Some TTFs -+ $im->stringFT($black,FONT,12.0,0.0,20,20,"Hello world!") || warn $@; -+ $im->stringFT($red,FONT,14.0,0.0,20,80,"Hello world!") || warn $@; -+ $im->stringFT($blue,FONT,30.0,-0.5,60,100,"Goodbye cruel world!") || warn $@; -+ $im->png; -+} -+ -+sub test9 { -+ my $fn = shift; -+ my $im = GD::Image->newFromXpm($fn); -+ $im->png; -+} -+ -+sub test10 { -+ my $fn = shift; -+ my $im = GD::Image->newFromJpeg($fn); -+ $im->png; -+} -+ -+# not used -+sub test11 { -+ my $fn = shift; -+ my $im = GD::Image->newFromGif($fn); -+ $im->gif; -+} -+ -diff -Naurp GD-2.05.orig/t/frog.gif GD-2.05/t/frog.gif ---- GD-2.05.orig/t/frog.gif 1969-12-31 19:00:00.000000000 -0500 -+++ GD-2.05/t/frog.gif 2003-01-06 17:07:02.000000000 -0500 -@@ -0,0 +1,28 @@ -+GIF89a00÷!!)) !! .9)!!)!)!!%111)11!9 d1+-m@yI6uO„:1„C|[.|aŒA;-<+ŠP‡]1Œ\ ˆs1Št¤3žD!œ@-¤&+·%2£@5µ;Ð5&Ä3*Ì-)ÌC9½)5½73Ã/1Ó2˜U5œM1šZ+˜u5¹J4±Z+¿X-ÔUÝ× ðÜ)âÉ+æ×æçõéîç$ïäï÷ïÿ÷ï÷÷÷ÿÿïÿ÷ÿÿïïï÷÷ï ôñï÷÷ÿÿ÷ÿÿìñ÷ï÷÷÷ÿ÷ÿÿïÿ÷ÿÿ!ñùÿóÿÿ!ÿÿ-óï-ó÷+ÿñ-ýýL‘LšI•UvN-ŒH.˜H/˜R*¢S£R°O±H¨E-¡T/±G-°R*FŒ0C­/>À'B»9:Î'<Î1>Ç;<Ñ;eb4Y˜/N»/OÆ2“]3³bp.»"ç”äŸï ÷œ÷¥ÿ”ÿœÿ¥Ò˜ؔé‘èž÷¥ÿœûœù™&ã« ÷­÷±ÿ¥ÿ­ÿ­ÿµÿ½Þ©$Ù²3ó©ï¯*ÿ¥û¥&ýµü¹)KuJGŠPH›RK©LF·HPµFF±UR±R;¿TFÁNNÄFRÁRBÊN=ÔQHÔFJÓRJ€aMšcK­eV«cA½gP¿`FÌ_RÐ`N™xKºwDÛªCâÏ9äÜIãß?õä?õõh‹\dªY]µO`³b\ÅLaÁYbµk^Ìly_F–bJƒžSuÁ]ÃvHÛ§O¯¼ZݸPač`ÛÆq֜¡Ã¡Zæãmîî¤ÿÿ¹ÿÿÜØÅóû÷Æÿÿáÿüäüÿïÿÿûûÿÿÿÿ,00þ»Üi3'̛3fêdÙÖ-žCzñ¶mû’¥K1çÌ!s¦c™2f̜áxæ ˜7wN’¹#FÁ”r¶p³gïžM›4½iáógmÚt YÆMI’cî¼yŒ2n¸Ü‘ÃfÏšûöñë׏Ÿ>~üöék¯6nވ iƍˎpߌycåJ3oö Áƒ…Û½¯üüõÓº5,Y{pä¸ é¦qH‚pKŠ13 ™7aFÊ­'ΗoöÆÚm³Þ7,kÔ,f,GÎ7AvÔ£ºÌA»BÁØñ’§bÐôê1¤×­·?y܈ڑ Ë6o„"tã%ŸÞ¶þ|±Ã œ>pðà9G0sôŒl´ :Ò͔©ÃG‹q$ÄÃÀ>ÿøÃO Þpá†~\:44DCC=ø°B< -+`3Å5ì„VP3E -+ÜÄ1ÆNÆÊÿôCÁ>ý@€` øÑÅې€Í 5 “à CHÁà -+Ði6;èÄÈ\A *‡…­ýL€?ä#@>àÃþ Å–þ0C4:DrÄ9§BM˜3à :P‘Œ•q 5P”À DðCÀ<óTàOù0>øÓ@™0Lq4,CK,100 4Á A˔œ»•ÛœðCFPAD$̱ÙþS×0D•HB %I³^P  `JÃ&@h2É3O ±Ä1 06ÙHaE3”H" ÍP‚8“LâL2Ř.ÀÙT3ÍìNL՜Â4äh¢¼2E(Ä%T˜3À -+3Ø0„Í3 9Ë`¾L$›PrI‘$¿ M4ÁÌ$âCÌ3NQ3( SŒ2–0ñDèHp-€<˜¬€ b (8F5ŽAŒ#0CeÅ G1"qŽd0ƒ‘(G9"Q eT¢M8ÇQ€‚&8 H¸‚F x¬ÀÙ¨B×Ä¡ ÕȆ.`wþ¦ âƒgºpŒÃÈxÆ2†À%8# WDHÀ(`n(Æ2–Q x$  D È%’l†1¦sd–h‚5R°x\  F5†qàù0È@|Ø|Àø–&ɁüP–@ €’Ea.`B2RЍm” 8ß8€€‘”~ˆvزƒð nÙ €c@²i”c P\0Ü\†4¾h1Î2Œ¸e/pˆnhÇ<$L7þPÊÓ -+˜a…ð_›8–qc˜#x)þØ]'[9 ¼£ïÈÅ;š‹Ol n4°ŽL(¯(@† ¶4|ÃÐ(äì©sÃÒó¢éD`/öЋHéxHŒeX#à G.`G¼“|p<‚!\`!8à4@Žr £Õ0F9ÄQŽcuâXG1˜ðŒ#PÁ•Ø„ P xL!)؂者-¤`FPÞ&,qctM0‡1ˆÁ '\ÂL¨¡žñÀaC“0ÇPƒ*‰­Q#,ˆ"m¸@F.Á küÁ¸À:›` K¬¯k¥2p¸ b€x‡%œðKDñþ‡<ÎáwœCÚx ²‘ƒdPáR‹‚1ŒAÌi”„Æ=.„1¬(ã JÀæQÛ\䢿pÇ:{Ö(РQA0r0„õ£&‹F Ž1sD; Â$Y€è ê[ƪ‹ XÈBº§;æGÖ 氀ª°„¬Fâ›Ê2ʁEaä  K`+$Â!ŽphÖtîÈ.| -+] bïÀ@2ƒpHN¤Áˆ2.!‰âÖ -+PHÊPc J°D2|ZHs€#êAr± P¸b¹Ð€ Œiƒ-ð€! jLb ð®9–AŽc„yM¸„þ Q ŒT¤Ç€Ä:.@붃žÆéB s€€‘‡0€hàà݃„•‡ÁáWÁ“8Æïv¥ £!0Ç‘ -+¸ÃèÀ`"@r0‘ŽÔ ×@怑XŽPÂ&$Ž/P8,ƒ`B@‡0€d &"0t`ÂÚ" Æ”qŒyè€Õv€ "Ã×ÆD$àŽlÀx÷:Ðtx¢é8D 8N"ƒ(„'Ò‰wvà@:” Œ €ËÈĬ›‹Tàâýý*~ -+Xàb€D#þ±ˆE4bƒy#ü-L€#µëÞÂýMYÿNŸø,Ha‹Qˆ"±Å-H1 -+Z˜‚ƒèD"ш‘"‰@9'ÒAH¢ :8ÑôAx‚è :ð“â¦ -ΎvS˜Â®XÓaC4â(—z:ÒQ|÷=°{"ˆN @D*~¡‹QÔ£0ÚÛÞ -+¸3‚t<ÝqˆApâ…`;ÒÁˆF¤Ã†(„¾ŸŠ]|ü›¼P….|qŠÚמ¬`….XÁ F°t±ð‰ ð -+¯Ð Š rWr ØMݤªÐ ŽW ¶7 -+§ ×W -+¦@ -+¤`Øç}"( -+ç -+¼Ð ®Ð «ð~¯° -+«° ºðM®À -+´Ðs´p -+£Ð -+¼ y§` 8ØÙ -+¹× -+ؗ}±` k·v¤ k÷s² ° Ö7 H -+k‡v­@„7x{8h -+¾À -+¾  ®Ðv·; -\ No newline at end of file -diff -Naurp GD-2.05.orig/t/test.out.11.png GD-2.05/t/test.out.11.png ---- GD-2.05.orig/t/test.out.11.png 1969-12-31 19:00:00.000000000 -0500 -+++ GD-2.05/t/test.out.11.png 2003-01-06 17:07:02.000000000 -0500 -@@ -0,0 +1,13 @@ -+‰PNG -+ -+ IHDR00`Ü µýPLTE!)) !! .9)!!)!)!!%111)11!9 d1+-m@yI6uO„:1„C|[.|aŒA;-<+ŠP‡]1Œ\ ˆs1Št¤3žD!œ@-¤&+·%2£@5µ;Ð5&Ä3*Ì-)ÌC9½)5½73Ã/1Ó2˜U5œM1šZ+˜u5¹J4±Z+¿X-ÔUÝ× ðÜ)âÉ+æ×æçõéîç$ïäï÷ïÿ÷ï÷÷÷ÿÿïÿ÷ÿÿïïï÷÷ï ôñï÷÷ÿÿ÷ÿÿìñ÷ï÷÷÷ÿ÷ÿÿïÿ÷ÿÿ!ñùÿóÿÿ!ÿÿ-óï-ó÷+ÿñ-ýýL‘LšI•UvN-ŒH.˜H/˜R*¢S£R°O±H¨E-¡T/±G-°R*FŒ0C­/>À'B»9:Î'<Î1>Ç;<Ñ;eb4Y˜/N»/OÆ2“]3³bp.»"ç”äŸï ÷œ÷¥ÿ”ÿœÿ¥Ò˜ؔé‘èž÷¥ÿœûœù™&ã« ÷­÷±ÿ¥ÿ­ÿ­ÿµÿ½Þ©$Ù²3ó©ï¯*ÿ¥û¥&ýµü¹)KuJGŠPH›RK©LF·HPµFF±UR±R;¿TFÁNNÄFRÁRBÊN=ÔQHÔFJÓRJ€aMšcK­eV«cA½gP¿`FÌ_RÐ`N™xKºwDÛªCâÏ9äÜIãß?õä?õõh‹\dªY]µO`³b\ÅLaÁYbµk^Ìly_F–bJƒžSuÁ]ÃvHÛ§O¯¼ZݸPač`ÛÆq֜¡Ã¡Zæãmîî¤ÿÿ¹ÿÿÜØÅóû÷Æÿÿáÿüäüÿïÿÿûûÿÿÿÿ)CàÌIDATxœ%S XW½3#]·uÕh¨€Š†¥R-PD@T@l…‘‡%X·ÉÈC¢‚¯†§"FyX…lÒ¤ àB!žI Qb@H„ºb# úí {îܹó8ç¿ÿ9ß 8Êa%|C2'CÕCz½~Z¯VG†f%$$Ä0™ÌØXƒ /Hfɉ"c':ž•À‰Šœ™yoÄÌÌó°”óɉ ,“É`IJ™$Ð9$ňì#œøï’ÏÏÌ ó ósó󆹹¹™¡Sß±Iä3ØñPAÒÉ$’w`ÉÇN… ¾‡ÔÅÃüü‚Q13s"ž Élxb%,ñ£tòX ¾aƐô“qq‘Ã3ssïßçû?†Cþuœ½T=žÉf±H(8sœK2Iˆa1£’"N‡==<3ý‡zhzhhðüiv4lŸÉd%ÄCºÑ -+;".åô1= -+ßÄ$Ÿ}™tä؉³'N:qöTü±¨„3ÆdX‰‰F~ìɔ°¡ÁSÇéLÃ9¾Õn«:2.þÌw‰,:'ŠC&-%CÂê PÀ8>¸må–ÁÈ3Ñ 6bzs››õ¦é”ˆäo ’•D!YlÉ‰â|ËbÅ0¢O‡ÙmÞµkז¡¸XúÜÆÙ½ïswkuJhô}>$e8"â\ÄpdÈpÄIO:ù|³Ä.m!‘ ìS·Ç.ª ›¡8X?6B½ò+·L‡M¯„ë`(;š:hçÑëàêîìì±U ô6nn*Ï={w|±52”¤G„o3,.6é?2üµ8oóü;霝‡C¯ãcGw÷]vzðá@P“ëžààþ ÛÁ8zòsâ¹é_ k `ÙâŠsG#՛œÚ\>óüÚÍùC`âì¬rݹçp×áþÿ<¢ÿha͟‹”Ytùs,þ-,6äðxgžÏKØÅ0ƒÃNZ÷|ï§ý6ƒÓú•ó˦¦>^DfM¦þ\¾¸b8r[³›£ÌËË×·G+Øö^‰'í@þՃÞOúpýFkÌ°°üãy:;»fÙ¢ÁZ­Þâᾏæ•'ßí»[%A±½×ÉóËü+W¯~ù¨·ï:¤Äfg L—E®$^ÇâÝEüG÷ûznÇ6 ú:ø·«W®øýF£jùü‡Ýí†â*¥GQ\ê¯|i¥-**êñþjÿ5šv_xîýMÊ•„,¯øê5ï¼Ñ"Íß_Î׶Kðö–SÛÚ{ -+üÜ¿ÿI -+ޙwI©µSÙ)õ‘ÓºÛGÛó^vË¥yccyʞü|ÿ—ð%Õÿáþý‡ƒ7¾z»/T‡úpmÿCï~¥jN ŠcF (Šb˜æEG×#YAõ}øåáÓ@¿É-€ ^àí2™ÇPA…òÉêÕÀŒB¡¬BPÃð¾¡SQ üŸØÂOwÇ¥Ê6ZDÌLÍV£ˆ…ùKSsSKKKs ¥À¹âCÓÊìýºm‡€ÚÆ —Ñ^`ˆ ²ÖԜÔô ×ò‚qYÌ)ò÷å¦ã=4{5ˆÜæL´çÉú0ôAVA^s}fffcsÛ) -+À6Q-L–*ޚ#­1­ìi§EmQ…;­1}ûæmÃÛ· ?®7[2A`¯¯µS»ìÃO€cÛ{qïÔ½ÒIt:̘õ8FÀ¤>°…† ©ìI_^±Æ -+שìSAbʏß%Z*¾ÑŠJ(t:ÍX›RÙ1¦ëlS¶i_·û=ò¡äÛSû~RنŸ‰!ᶮûŠŠŠ |:úpÔD×!•¸öЯÇÿÀ#9­­³‡¯S謨W¼Ÿô«>U«Ã€^­f¿wßn¿kò' -+¼U‚Såþr¾wq­«_)“И¦àÀÁ‚@ªþÝ»—`ròå³gŸ}®ré¦=ŶvtŒôD¥.-8•xàÐ(=øUw;159ÙÐn·L¾Ö?³u tTO9¿}LçðØ©ó…îq¯«_ª4ÁvvûËe¤×WßbqÛÉ) Ç 'nÝׇ|ó‹ópWwU×Ø ü‹¿oÏeVƒS1 òÅbÿÔøÖtõõí…1RI`×µ+£„S@@·×±³ß÷«‚n*ìL7¢yE˜54Þ¬ Ÿ —% -+I§T*Óâhk_?¿˜tÔÉF;‰@OÿkR%õ«æÝyù5¾zxc~£°z #Fó´h!òx‡Œ¸¬´i´ÄÎCù -+ÜÕÙ—8YépÍõµ“Àr|Œôš ŒXk^™N N.OùÖjÖaxÀžâ+ EZAë.ÙnUøÊŒSLǗ™¬Z[¸zÍxáx¡u¿OOç_Õ+qíò]ŸYP&-ÖO"ë'×[¼ã7Ò&2.–\(Ià¦Ý˜¸ìêâIՎP&Æ)­Ô~Ùu¬¡¡áçú–úꖟZnU×W€ xYÙÙ<.——Å+I¥Ž`š×(:1^’ºkUà¯~ÜP-¸W^VSsë?‚òZaà–fåòxYYY\nÉDª¥iª…iêx Ç½‘jjqÁbÃO-‘°¶V  …ª*ËËHOçår¹FÁDZšñà¥ó².^,åf–fþÜ".¯– EpoCANNFúÔdepK2Òrþ;‘Ûø!=-ã"ä6ÖW467ý"¾/2BPY)®l9¹ž‘• 7âñr Òy9ßçò23ëÅ-U÷˛î7U–- ÄÕâH‡”ì¬ìÜŒÈÍÎæf”~_ÚÜ,¾u¿IxW,¾uWt·ìf]­ -+jªkjj@nÖ¥Ò_-½t)²/]‚?æ¥_šËëê`Írѝ2Ñ¿…AÝRO58@™¸¼ª©¹ª¹¢¹ù׊ŠFqcsUeí½òZQùí&Xöž¨¼®V$¸YYyûÿF@ͽZA­@PS+(«¹s§ºº²ì®@Ÿˆ„·o‹jQ¹ð~å}qL Þý±xðFë\IEND®B`‚ -\ No newline at end of file diff --git a/dev-perl/GD/files/2.12-makefile-opts.patch b/dev-perl/GD/files/2.12-makefile-opts.patch deleted file mode 100644 index 4fe42f0196e8..000000000000 --- a/dev-perl/GD/files/2.12-makefile-opts.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.PL.orig 2003-06-26 11:09:51.000000000 -0400 -+++ Makefile.PL 2003-06-26 11:12:50.000000000 -0400 -@@ -94,12 +94,7 @@ - ################################################################### - # path to libgd, skip prompt if passed in from above - ################################################################### --my $PREFIX = $lib_gd_path; --if( ! defined($lib_gd_path) ) --{ -- warn "\n"; -- $PREFIX = prompt('Where is libgd installed?','/usr/lib'); --} -+my $PREFIX = '/usr/lib'; - - unless ($PREFIX eq '/usr/lib') { - $PREFIX =~ s!/lib$!!; -@@ -112,20 +107,9 @@ - ################################################################################################################## - # If build options have not been passed in then prompt for settings - ################################################################################################################## --my ($JPEG, $FT, $XPM) = (undef, undef, undef); --if( defined($options) ) --{ -- if( $options =~ m/JPEG/i ) { $JPEG = 1; } else { $JPEG = 0; } -- if( $options =~ m/FT/i ) { $FT = 1; } else { $FT = 0; } -- if( $options =~ m/XPM/i ) { $XPM = 1; } else { $XPM = 0; } --} --else --{ -- warn "\nPlease choose the features that match how libgd was built:\n"; -- $JPEG = lc prompt('Build JPEG support?','y') eq 'y'; -- $FT = lc prompt('Build FreeType support?','y') eq 'y'; -- $XPM = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y'; --} -+my $JPEG = 'GENTOO_JPEG'; -+my $FT = 'GENTOO_FREETYPE'; -+my $XPM = 'GENTOO_XPM'; - ################################################################################################################## - - my $FCGI = 0; # set to 1 to build compatability with fastCGI diff --git a/dev-perl/GD/files/digest-GD-2.12 b/dev-perl/GD/files/digest-GD-2.12 deleted file mode 100644 index d9a3ea15a3b5..000000000000 --- a/dev-perl/GD/files/digest-GD-2.12 +++ /dev/null @@ -1 +0,0 @@ -MD5 84de3734fb32947d08c0d3d1e68201a6 GD-2.12.tar.gz 155680 diff --git a/dev-perl/GD/files/digest-GD-2.18 b/dev-perl/GD/files/digest-GD-2.18 new file mode 100644 index 000000000000..573bfecc2eef --- /dev/null +++ b/dev-perl/GD/files/digest-GD-2.18 @@ -0,0 +1 @@ +MD5 d355eb0bb3986140c84fe648cf69b562 GD-2.18.tar.gz 175619 -- 2.26.2