media-gfx/optipng: Bump to 0.6.5

(Portage version: 2.1.10.9/cvs/Linux x86_64)

3 files changed, 146 insertions, 1 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 42134ee30150..b06ac8bd818b 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.62 2011/01/30 09:23:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.63 2011/08/02 15:10:47 sping Exp $
+
+*optipng-0.6.5 (02 Aug 2011)
+
+  02 Aug 2011; Sebastian Pipping <sping@gentoo.org> +optipng-0.6.5.ebuild,
+  +files/optipng-0.6.5-libpng-1.4.8.patch:
+  Bump to 0.6.5, fix compilation for libpng 1.4.8, deny compilation against
+  libpng 1.5 from ebuild to match upstream's changes in configure script
 
   30 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> optipng-0.6.4.ebuild:
   Add ~ppc64 wrt #346383
diff --git a/media-gfx/optipng/files/optipng-0.6.5-libpng-1.4.8.patch b/media-gfx/optipng/files/optipng-0.6.5-libpng-1.4.8.patch
new file mode 100644
index 000000000000..0714f685b6f5
--- /dev/null
+++ b/media-gfx/optipng/files/optipng-0.6.5-libpng-1.4.8.patch
@@ -0,0 +1,84 @@
+From d84fd1880aae22a2a92ca759a3f9e07f2f7b6bee Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 2 Aug 2011 17:01:51 +0200
+Subject: [PATCH] Fix compilation against libpng 1.4.8
+
+---
+ src/opngoptim.c |    2 +-
+ src/opngreduc.c |   16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/opngoptim.c b/src/opngoptim.c
+index 16f7acd..ead0c6e 100644
+--- a/src/opngoptim.c
++++ b/src/opngoptim.c
+@@ -19,10 +19,10 @@
+ #include "proginfo.h"
+ 
+ #include "cbitset.h"
+-#include "cexcept.h"
+ #include "opngreduc.h"
+ #include "osys.h"
+ #include "png.h"
++#include "cexcept.h"
+ #include "pngx.h"
+ #include "pngxtern.h"
+ #include "zlib.h"
+diff --git a/src/opngreduc.c b/src/opngreduc.c
+index e4d5c98..5ef0b60 100644
+--- a/src/opngreduc.c
++++ b/src/opngreduc.c
+@@ -366,8 +366,8 @@ opng_get_alpha_row(png_structp png_ptr, png_infop info_ptr,
+    channels = (png_ptr->usr_channels > 0) ?
+       png_ptr->usr_channels : info_ptr->channels;
+    sample_ptr = row;
+-   if (!(png_ptr->transformations & PNG_FILLER) ||
+-        (png_ptr->flags & PNG_FLAG_FILLER_AFTER))
++   if (!(png_ptr->transformations & OPNG_FILLER) ||
++        (png_ptr->flags & OPNG_FLAG_FILLER_AFTER))
+       sample_ptr += channels - 1;  /* alpha sample is the last in RGBA tuple */
+    for (i = 0; i < width; ++i, sample_ptr += channels, ++alpha_row)
+       *alpha_row = *sample_ptr;
+@@ -416,8 +416,8 @@ opng_analyze_bits(png_structp png_ptr, png_infop info_ptr,
+       reductions &= ~OPNG_REDUCE_STRIP_ALPHA;
+ 
+    offset_color = offset_alpha = 0;
+-   if ((png_ptr->transformations & PNG_FILLER) &&
+-       !(png_ptr->flags & PNG_FLAG_FILLER_AFTER))
++   if ((png_ptr->transformations & OPNG_FILLER) &&
++       !(png_ptr->flags & OPNG_FLAG_FILLER_AFTER))
+       offset_color = byte_depth;
+    else
+       offset_alpha = (channels - 1) * byte_depth;
+@@ -565,7 +565,7 @@ opng_reduce_bits(png_structp png_ptr, png_infop info_ptr,
+    /* See which reductions may be performed. */
+    reductions = opng_analyze_bits(png_ptr, info_ptr, reductions);
+    /* Strip the filler even if it is not an alpha channel. */
+-   if (png_ptr->transformations & PNG_FILLER)
++   if (png_ptr->transformations & OPNG_FILLER)
+       reductions |= OPNG_REDUCE_STRIP_ALPHA;
+    if (reductions == OPNG_REDUCE_NONE)
+       return OPNG_REDUCE_NONE;  /* nothing can be reduced */
+@@ -606,8 +606,8 @@ opng_reduce_bits(png_structp png_ptr, png_infop info_ptr,
+    dest_sample_size = dest_channels * dest_byte_depth;
+    dest_pixel_depth = dest_channels * dest_bit_depth;
+ 
+-   if (!(png_ptr->transformations & PNG_FILLER) ||
+-       (png_ptr->flags & PNG_FLAG_FILLER_AFTER))
++   if (!(png_ptr->transformations & OPNG_FILLER) ||
++       (png_ptr->flags & OPNG_FLAG_FILLER_AFTER))
+       src_offset_alpha = (src_channels - 1) * src_byte_depth;
+    else
+       src_offset_alpha = 0;
+@@ -748,7 +748,7 @@ opng_reduce_bits(png_structp png_ptr, png_infop info_ptr,
+    png_ptr->pixel_depth = info_ptr->pixel_depth = (png_byte)dest_pixel_depth;
+    if (reductions & OPNG_REDUCE_STRIP_ALPHA)
+    {
+-      png_ptr->transformations &= ~PNG_FILLER;
++      png_ptr->transformations &= ~OPNG_FILLER;
+       if (png_ptr->usr_channels > 0)
+          --png_ptr->usr_channels;
+    }
+-- 
+1.7.6
+
diff --git a/media-gfx/optipng/optipng-0.6.5.ebuild b/media-gfx/optipng/optipng-0.6.5.ebuild
new file mode 100644
index 000000000000..fbb0fa635087
--- /dev/null
+++ b/media-gfx/optipng/optipng-0.6.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.5.ebuild,v 1.1 2011/08/02 15:10:47 sping Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Compress PNG files without affecting image quality"
+HOMEPAGE="http://optipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="<media-libs/libpng-1.5"
+
+src_prepare() {
+	sed -i \
+		-e '/^C/s: -O2.*: $(GENTOO_CFLAGS) -Wall:' \
+		-e '/^LD/s: -s$: $(GENTOO_LDFLAGS):' \
+		src/scripts/gcc.mak.in \
+		lib/pngxtern/scripts/gcc.mak.in \
+		|| die "sed failed"
+	cp lib/libpng/pngpriv.h src/ || die
+	rm -rf lib/{libpng,zlib}
+
+	epatch "${FILESDIR}"/${P}-libpng-1.4.8.patch
+}
+
+src_configure() {
+	./configure \
+		-with-system-libpng \
+		-with-system-zlib \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake \
+		-C src \
+		-f scripts/gcc.mak \
+		CC="$(tc-getCC)" \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin src/optipng || die "dobin failed"
+	dodoc README.txt doc/*.txt || die
+	dohtml doc/*.html || die
+	doman man/optipng.1 || die
+}