summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2004-06-03 08:25:00 +0000
committerTavis Ormandy <taviso@gentoo.org>2004-06-03 08:25:00 +0000
commit894dee6fd08f8a82a31c70fa28e7923ce3c7de0d (patch)
tree276b64f3aed33b314953be9644b73995746d946e /media-gfx/optipng
parentStable on alpha. (Manifest recommit) (diff)
downloadgentoo-2-894dee6fd08f8a82a31c70fa28e7923ce3c7de0d.tar.gz
gentoo-2-894dee6fd08f8a82a31c70fa28e7923ce3c7de0d.tar.bz2
gentoo-2-894dee6fd08f8a82a31c70fa28e7923ce3c7de0d.zip
change description, better way of selecting mmx.
Diffstat (limited to 'media-gfx/optipng')
-rw-r--r--media-gfx/optipng/ChangeLog6
-rw-r--r--media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff16
-rw-r--r--media-gfx/optipng/optipng-0.4.5.ebuild10
3 files changed, 21 insertions, 11 deletions
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 79a791b1c9fa..549e38da0742 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/optipng
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.7 2004/06/02 22:54:30 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.8 2004/06/03 08:25:00 taviso Exp $
+
+ 03 Jun 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.5.ebuild,
+ files/optipng-0.4.5-more-makefile-options.diff:
+ use ifeq syntax instead of setting env vars.
*optipng-0.4.5 (02 Jun 2004)
diff --git a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
index 4506ea2673b5..91f16e1b2b05 100644
--- a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
+++ b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
@@ -1,5 +1,5 @@
--- optipng-0.4.5.orig/src/scripts/Makefile.gcc 2004-05-31 10:38:00.000000000 +0100
-+++ optipng-0.4.5/src/scripts/Makefile.gcc 2004-06-02 23:49:49.134972424 +0100
++++ optipng-0.4.5/src/scripts/Makefile.gcc 2004-06-03 09:21:38.958025528 +0100
@@ -3,22 +3,40 @@
all: optipng
@@ -47,13 +47,19 @@
libpng.a: ../lib-cos/libpng/libpng.a
cp ../lib-cos/libpng/libpng.a libpng.a
-@@ -28,10 +46,10 @@
+@@ -27,11 +45,14 @@
+ cp ../lib-cos/zlib/libz.a libz.a
../lib-cos/libpng/libpng.a: ../lib-cos/zlib/libz.a
- cd ../lib-cos/libpng; \
+- cd ../lib-cos/libpng; \
- ${MAKE} -f scripts/makefile.gcc; \
-+ ${MAKE} -f scripts/${pngmake}; \
- cd ../../src
+- cd ../../src
++ifeq (${usemmx},1)
++ cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcmmx; cd ../../src
++else
++ cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcc; cd ../../src
++endif
++
../lib-cos/zlib/libz.a:
cd ../lib-cos/zlib; \
diff --git a/media-gfx/optipng/optipng-0.4.5.ebuild b/media-gfx/optipng/optipng-0.4.5.ebuild
index a74e1a4d4a62..7bf25da5eabd 100644
--- a/media-gfx/optipng/optipng-0.4.5.ebuild
+++ b/media-gfx/optipng/optipng-0.4.5.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# 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.1 2004/06/02 22:54:30 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.2 2004/06/03 08:25:00 taviso Exp $
inherit eutils flag-o-matic
-DESCRIPTION="PNG optimizing utility"
+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/"
@@ -41,9 +41,9 @@ src_compile() {
# do amd64/ia64 support mmx?
use x86 || ewarn "mmx flag set, but not on x86?"
- pngmake=makefile.gcmmx
+ usemmx=1
else
- pngmake=makefile.gcc
+ usemmx=0
fi
# only defined in bundled zlib?
@@ -51,7 +51,7 @@ src_compile() {
append-flags -DZ_RLE=3
fi
- export pngmake LDFLAGS
+ export usemmx LDFLAGS
# some logic to decide which version to build...
if ! use ext-png; then