bad zlib header

5 files changed, 119 insertions, 3 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 6dd715204fe0..71be24ead921 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/optipng
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.3 2003/11/06 20:41:11 taviso Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.4 2004/03/13 15:53:16 taviso Exp $
+
+*optipng-0.4.3-r1 (13 Mar 2004)
+
+  13 Mar 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.3-r1.ebuild,
+  files/optipng-0.4.3-r1-more-makefile-options.diff:
+  fixing patch (wrong zlib header)
 
   06 Nov 2003; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.3.ebuild:
   stable
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 76493d32bc4a..d2e6dc790d4e 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,5 +1,8 @@
+MD5 44326af8ba481a52117e9e49e31cf2c7 optipng-0.4.3-r1.ebuild 1785
 MD5 8f94c1bca6c7ba1a2fa5cb5a233ace83 optipng-0.4.3.ebuild 1764
-MD5 8c9caef9e4f4f4a01c857b2895232a07 ChangeLog 647
+MD5 6da9b319970781b82295337368708152 ChangeLog 843
 MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400
+MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3-r1 65
 MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3 65
 MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423
+MD5 ae0b66a3fd8e8cff827c907900a5d63c files/optipng-0.4.3-r1-more-makefile-options.diff 1552
diff --git a/media-gfx/optipng/files/digest-optipng-0.4.3-r1 b/media-gfx/optipng/files/digest-optipng-0.4.3-r1
new file mode 100644
index 000000000000..f8b671d7617c
--- /dev/null
+++ b/media-gfx/optipng/files/digest-optipng-0.4.3-r1
@@ -0,0 +1 @@
+MD5 3ed23ff9c204d7ffbd0fa6b3c53d830e optipng-0.4.3.tar.gz 555842
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
new file mode 100644
index 000000000000..cc60db94cef2
--- /dev/null
+++ b/media-gfx/optipng/files/optipng-0.4.3-r1-more-makefile-options.diff
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000000..efdbecbb60c0
--- /dev/null
+++ b/media-gfx/optipng/optipng-0.4.3-r1.ebuild
@@ -0,0 +1,67 @@
+# 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.3-r1.ebuild,v 1.1 2004/03/13 15:53:16 taviso 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/glibc
+	ext-png? ( media-libs/libpng )
+	ext-zlib? ( sys-libs/zlib )"
+
+S=${WORKDIR}/${P}
+
+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
+}