diff options
author | Tavis Ormandy <taviso@gentoo.org> | 2005-01-13 23:49:08 +0000 |
---|---|---|
committer | Tavis Ormandy <taviso@gentoo.org> | 2005-01-13 23:49:08 +0000 |
commit | 77189a30153f8685ab67eaf1d402672b4f18d81b (patch) | |
tree | a8196a1dc375659a475a16b4175553e35eb27821 /media-gfx/optipng | |
parent | sec fix can 1137 1056 (Manifest recommit) (diff) | |
download | gentoo-2-77189a30153f8685ab67eaf1d402672b4f18d81b.tar.gz gentoo-2-77189a30153f8685ab67eaf1d402672b4f18d81b.tar.bz2 gentoo-2-77189a30153f8685ab67eaf1d402672b4f18d81b.zip |
new version
Diffstat (limited to 'media-gfx/optipng')
-rw-r--r-- | media-gfx/optipng/ChangeLog | 11 | ||||
-rw-r--r-- | media-gfx/optipng/Manifest | 30 | ||||
-rw-r--r-- | media-gfx/optipng/files/digest-optipng-0.4.3 | 1 | ||||
-rw-r--r-- | media-gfx/optipng/files/digest-optipng-0.4.3-r1 | 1 | ||||
-rw-r--r-- | media-gfx/optipng/files/digest-optipng-0.4.7 | 1 | ||||
-rw-r--r-- | media-gfx/optipng/files/optipng-0.4.3-r1-more-makefile-options.diff | 39 | ||||
-rw-r--r-- | media-gfx/optipng/optipng-0.4.3-r1.ebuild | 65 | ||||
-rw-r--r-- | media-gfx/optipng/optipng-0.4.3.ebuild | 65 | ||||
-rw-r--r-- | media-gfx/optipng/optipng-0.4.5.ebuild | 4 | ||||
-rw-r--r-- | media-gfx/optipng/optipng-0.4.7.ebuild | 33 |
10 files changed, 58 insertions, 192 deletions
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog index c3e883d6ff72..4cec76ee50a0 100644 --- a/media-gfx/optipng/ChangeLog +++ b/media-gfx/optipng/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/optipng -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.14 2004/12/29 15:22:54 slarti Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.15 2005/01/13 23:49:08 taviso Exp $ + +*optipng-0.4.7 (13 Jan 2005) + + 13 Jan 2005; Tavis Ormandy <taviso@gentoo.org> + -files/optipng-0.4.3-r1-more-makefile-options.diff, + -optipng-0.4.3-r1.ebuild, -optipng-0.4.3.ebuild, +optipng-0.4.7.ebuild: + clean out stale ebuilds, new version 29 Dec 2004; Tom Martin <slarti@gentoo.org> optipng-0.4.5.ebuild: Marked ~amd64, resolves bug 73180. diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest index e4f79d0da011..7ac9fa9849cc 100644 --- a/media-gfx/optipng/Manifest +++ b/media-gfx/optipng/Manifest @@ -1,21 +1,17 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 02315c1504c589f0a8ede1e06ce0f57c ChangeLog 1846 -MD5 3d378199d61ce13715bc2ae7f3b2df27 optipng-0.4.5.ebuild 2586 +MD5 567b89fb68bac13c20c5db5d37d6daf3 optipng-0.4.3-r1.ebuild 1756 MD5 fb514763cd5e804511e03c8440ae095a optipng-0.4.3.ebuild 1753 +MD5 8e2101d14ea22c99923ce70280a839fc optipng-0.4. 862 +MD5 3d378199d61ce13715bc2ae7f3b2df27 optipng-0.4.5.ebuild 2586 +MD5 540929107798634995300babbc72f71d .optipng-0.4.5-r1.ebuild.swp 12288 +MD5 f978ae5de9209ae4ac852f2bb30b19ba optipng-0.4.5-r1.ebuild 1048 +MD5 02315c1504c589f0a8ede1e06ce0f57c ChangeLog 1846 +MD5 f4476b02ef0663b16e08929d355aa371 optipng-0.4.7.ebuild 1017 MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400 -MD5 567b89fb68bac13c20c5db5d37d6daf3 optipng-0.4.3-r1.ebuild 1756 -MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423 -MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5 65 -MD5 95e87b9aa8430dbe8d14268fb922a818 files/optipng-0.4.5-more-makefile-options.diff 2271 -MD5 ae0b66a3fd8e8cff827c907900a5d63c files/optipng-0.4.3-r1-more-makefile-options.diff 1552 MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3-r1 65 +MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5-r1 65 MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFB0sxXCHk4+ZoBpvsRArqpAKC6WAmRJXSZ0eFCxwtLjcfoaj5z8QCfaRrh -+bqKPzoKOyriKTj8pVYh/VY= -=hwHU ------END PGP SIGNATURE----- +MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5 65 +MD5 6bb7aeb92d547a0979d3bc3ee21b9319 files/digest-optipng-0.4.7 65 +MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423 +MD5 ae0b66a3fd8e8cff827c907900a5d63c files/optipng-0.4.3-r1-more-makefile-options.diff 1552 +MD5 95e87b9aa8430dbe8d14268fb922a818 files/optipng-0.4.5-more-makefile-options.diff 2271 diff --git a/media-gfx/optipng/files/digest-optipng-0.4.3 b/media-gfx/optipng/files/digest-optipng-0.4.3 deleted file mode 100644 index f8b671d7617c..000000000000 --- a/media-gfx/optipng/files/digest-optipng-0.4.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 3ed23ff9c204d7ffbd0fa6b3c53d830e optipng-0.4.3.tar.gz 555842 diff --git a/media-gfx/optipng/files/digest-optipng-0.4.3-r1 b/media-gfx/optipng/files/digest-optipng-0.4.3-r1 deleted file mode 100644 index f8b671d7617c..000000000000 --- a/media-gfx/optipng/files/digest-optipng-0.4.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3ed23ff9c204d7ffbd0fa6b3c53d830e optipng-0.4.3.tar.gz 555842 diff --git a/media-gfx/optipng/files/digest-optipng-0.4.7 b/media-gfx/optipng/files/digest-optipng-0.4.7 new file mode 100644 index 000000000000..ca9373c6ec1f --- /dev/null +++ b/media-gfx/optipng/files/digest-optipng-0.4.7 @@ -0,0 +1 @@ +MD5 673337f61d53830541ff987f50025b96 optipng-0.4.7.tar.gz 658952 diff --git a/media-gfx/optipng/files/optipng-0.4.3-r1-more-makefile-options.diff b/media-gfx/optipng/files/optipng-0.4.3-r1-more-makefile-options.diff deleted file mode 100644 index cc60db94cef2..000000000000 --- a/media-gfx/optipng/files/optipng-0.4.3-r1-more-makefile-options.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -ruN optipng-0.4.3.orig/src/scripts/Makefile.gcc optipng-0.4.3/src/scripts/Makefile.gcc ---- optipng-0.4.3.orig/src/scripts/Makefile.gcc 2003-05-12 22:11:56.000000000 +0100 -+++ optipng-0.4.3/src/scripts/Makefile.gcc 2004-03-13 15:38:59.000000000 +0000 -@@ -3,19 +3,26 @@ - - all: optipng - --optipng: optipng.o opngio.o opngreduc.o cbitset.o \ -- wildargs.o libpng.a libz.a -- gcc -s -o optipng optipng.o opngio.o opngreduc.o cbitset.o \ -- wildargs.o libpng.a libz.a -+optipng: CFLAGS += -I../lib-cos/zlib -I../lib-cos/libpng -+optipng: optipng.o opngio.o opngreduc.o cbitset.o libpng.a libz.a -+ ${CC} ${LDFLAGS} -o optipng optipng.o opngio.o opngreduc.o cbitset.o libpng.a libz.a -+ -+optipng-extpng: CFLAGS += -I../lib-cos/zlib -+optipng-extpng: optipng.o opngio.o opngreduc.o cbitset.o libz.a -+ ${CC} ${LDFLAGS} -lpng -o optipng optipng.o opngio.o opngreduc.o cbitset.o libz.a -+ -+optipng-extzlib: CFLAGS += -I../lib-cos/libpng -+optipng-extzlib: optipng.o opngio.o opngreduc.o cbitset.o libpng.a -+ ${CC} ${LDFLAGS} -lz -o optipng optipng.o opngio.o opngreduc.o cbitset.o libpng.a -+ -+optipng-allext: optipng.o opngio.o opngreduc.o cbitset.o -+ ${CC} ${LDFLAGS} -lpng -lz -o optipng optipng.o opngio.o opngreduc.o cbitset.o - - .c.o: #png.h opng.h -- gcc -c -O2 -I../lib-cos/zlib -I../lib-cos/libpng -Wall $*.c -+ gcc ${CFLAGS} -c $*.c - - cbitset.o: cbitset.c cbitset.h -- gcc -c -O2 -Wall $*.c -- --wildargs.o: xtra/wildargs.c -- gcc -c -O2 xtra/wildargs.c -+ gcc ${CFLAGS} -c $*.c - - libpng.a: ../lib-cos/libpng/libpng.a - cp ../lib-cos/libpng/libpng.a libpng.a diff --git a/media-gfx/optipng/optipng-0.4.3-r1.ebuild b/media-gfx/optipng/optipng-0.4.3-r1.ebuild deleted file mode 100644 index 91bd1a9246d2..000000000000 --- a/media-gfx/optipng/optipng-0.4.3-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.3-r1.ebuild,v 1.5 2004/07/14 17:48:53 agriffis Exp $ - -inherit eutils - -DESCRIPTION="PNG optimizing utility" -SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz" -HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/" - -LICENSE="as-is" - -SLOT="0" -KEYWORDS="x86 ~ppc alpha" - -IUSE="ext-png ext-zlib" - -DEPEND="virtual/libc - ext-png? ( media-libs/libpng ) - ext-zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - - # optionally use the system binaries, rather than the bundled - # patched versions (some archs/configurations require patches - # not included here) - cd ${S}/src; epatch ${FILESDIR}/${PF}-more-makefile-options.diff -} - -src_compile() { - cd ${S}/src - - # some logic to decide which version to build... - if ! use ext-png; then - if ! use ext-zlib; then - # use the included patched zlib/libpng - einfo "Building ${PN} with bundled libraries..." - emake -f scripts/Makefile.gcc optipng - else - # use the system zlib. - einfo "Building ${PN} with bundled libpng..." - emake -f scripts/Makefile.gcc optipng-extzlib - fi - else - if use ext-zlib; then - # use the system zlib and libpng. - einfo "Building ${PN} without bundled libraries..." - emake -f scripts/Makefile.gcc optipng-allext - else - # use the system libpng. - einfo "Building ${PN} with bundled zlib..." - emake -f scripts/Makefile.gcc optipng-extpng - fi - fi - - # some feedback everything went ok... - echo; ls -l optipng; size optipng -} - -src_install() { - dobin ${S}/src/optipng - dodoc ${S}/doc/{CAVEAT,DESIGN,FEATURES,HISTORY,LICENSE,README,TODO,USAGE} - dohtml ${S}/doc/index.html -} diff --git a/media-gfx/optipng/optipng-0.4.3.ebuild b/media-gfx/optipng/optipng-0.4.3.ebuild deleted file mode 100644 index 4e4ee9040fe6..000000000000 --- a/media-gfx/optipng/optipng-0.4.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.3.ebuild,v 1.7 2004/07/14 17:48:53 agriffis Exp $ - -inherit eutils - -DESCRIPTION="PNG optimizing utility" -SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz" -HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/" - -LICENSE="as-is" - -SLOT="0" -KEYWORDS="x86 ~ppc alpha" - -IUSE="ext-png ext-zlib" - -DEPEND="virtual/libc - ext-png? ( media-libs/libpng ) - ext-zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - - # optionally use the system binaries, rather than the bundled - # patched versions (some archs/configurations require patches - # not included here) - cd ${S}/src; epatch ${FILESDIR}/${PN}-more-makefile-options.diff -} - -src_compile() { - cd ${S}/src - - # some logic to decide which version to build... - if ! use ext-png; then - if ! use ext-zlib; then - # use the included patched zlib/libpng - einfo "Building ${PN} with bundled libraries..." - emake -f scripts/Makefile.gcc optipng - else - # use the system zlib. - einfo "Building ${PN} with bundled libpng..." - emake -f scripts/Makefile.gcc optipng-extzlib - fi - else - if use ext-zlib; then - # use the system zlib and libpng. - einfo "Building ${PN} without bundled libraries..." - emake -f scripts/Makefile.gcc optipng-allext - else - # use the system libpng. - einfo "Building ${PN} with bundled zlib..." - emake -f scripts/Makefile.gcc optipng-extpng - fi - fi - - # some feedback everything went ok... - echo; ls -l optipng; size optipng -} - -src_install() { - dobin ${S}/src/optipng - dodoc ${S}/doc/{CAVEAT,DESIGN,FEATURES,HISTORY,LICENSE,README,TODO,USAGE} - dohtml ${S}/doc/index.html -} diff --git a/media-gfx/optipng/optipng-0.4.5.ebuild b/media-gfx/optipng/optipng-0.4.5.ebuild index 0e41d777691d..7261d527214b 100644 --- a/media-gfx/optipng/optipng-0.4.5.ebuild +++ b/media-gfx/optipng/optipng-0.4.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.9 2004/12/29 15:22:54 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.10 2005/01/13 23:49:08 taviso Exp $ inherit eutils flag-o-matic diff --git a/media-gfx/optipng/optipng-0.4.7.ebuild b/media-gfx/optipng/optipng-0.4.7.ebuild new file mode 100644 index 000000000000..250753c5700b --- /dev/null +++ b/media-gfx/optipng/optipng-0.4.7.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.7.ebuild,v 1.1 2005/01/13 23:49:08 taviso Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Find the optimal compression settings for your png files" +SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz" +HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/" + +LICENSE="as-is" + +SLOT="0" +KEYWORDS="~x86 ~ppc ~alpha" +IUSE="" + +DEPEND="virtual/libc" + +src_compile() { + cd ${S}/src + sed -i -e 's!-O2!${CFLAGS}!' scripts/gcc.mak + emake -f scripts/gcc.mak optipng CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" || die + + # some feedback everything went ok... + echo; ls -l optipng; size optipng +} + +src_install() { + dobin ${S}/src/optipng + dodoc ${S}/doc/{CAVEAT,DESIGN,FEATURES,HISTORY,LICENSE,README,TODO,USAGE} + dohtml ${S}/doc/index.html +} |