diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-14 14:44:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-14 14:44:49 +0000 |
| commit | 6ba0b18528b70babc292e479baf0bd642fe53909 (patch) | |
| tree | 863a5ddbe1793ad1d9542f129dbf3e5f0df8658b /media-libs/ming | |
| parent | Version bump, comprising changes from science overlay. (diff) | |
| download | gentoo-2-6ba0b18528b70babc292e479baf0bd642fe53909.tar.gz gentoo-2-6ba0b18528b70babc292e479baf0bd642fe53909.tar.bz2 gentoo-2-6ba0b18528b70babc292e479baf0bd642fe53909.zip | |
Fix building with libpng14 wrt #309309 by Peter Alfredsen.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/ming')
| -rw-r--r-- | media-libs/ming/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/ming/files/ming-0.4.x-libpng14.patch | 20 | ||||
| -rw-r--r-- | media-libs/ming/ming-0.2a.ebuild | 6 | ||||
| -rw-r--r-- | media-libs/ming/ming-0.4.0_rc2.ebuild | 3 |
4 files changed, 30 insertions, 5 deletions
diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog index 04235afd977b..6e78213c2e93 100644 --- a/media-libs/ming/ChangeLog +++ b/media-libs/ming/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/ming # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.60 2010/01/31 16:01:26 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.61 2010/03/14 14:44:47 ssuominen Exp $ + + 14 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + +files/ming-0.4.x-libpng14.patch, ming-0.4.0_rc2.ebuild: + Fix building with libpng14 wrt #309309 by Peter Alfredsen. 31 Jan 2010; Raúl Porcel <armin76@gentoo.org> ming-0.4.0_rc2.ebuild: ia64/s390/sh/sparc stable wrt #297476 diff --git a/media-libs/ming/files/ming-0.4.x-libpng14.patch b/media-libs/ming/files/ming-0.4.x-libpng14.patch new file mode 100644 index 000000000000..ce43fdec1d91 --- /dev/null +++ b/media-libs/ming/files/ming-0.4.x-libpng14.patch @@ -0,0 +1,20 @@ +--- src/blocks/pngdbl.c ++++ src/blocks/pngdbl.c +@@ -49,7 +49,7 @@ + + if(fread(header, 1, 8, fp) != 8) + return NULL; +- if(!png_check_sig(header, 8)) ++ if(png_sig_cmp(header, 0, 8)) + return NULL; + result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if(!result) +@@ -69,7 +69,7 @@ + + if(SWFInput_read(input, header, 8) != 8) + return NULL; +- if(!png_check_sig(header, 8)) ++ if(png_sig_cmp(header, 0, 8)) + return NULL; + result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if(!result) diff --git a/media-libs/ming/ming-0.2a.ebuild b/media-libs/ming/ming-0.2a.ebuild index eaca9df00af6..84d644c2f23c 100644 --- a/media-libs/ming/ming-0.2a.ebuild +++ b/media-libs/ming/ming-0.2a.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.28 2009/06/06 21:07:45 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.29 2010/03/14 14:44:47 ssuominen Exp $ inherit eutils toolchain-funcs multilib -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" DESCRIPTION="An Open Source library for Flash movie generation." HOMEPAGE="http://www.opaque.net/ming/" diff --git a/media-libs/ming/ming-0.4.0_rc2.ebuild b/media-libs/ming/ming-0.4.0_rc2.ebuild index 032ae13201db..0ab9521a2fce 100644 --- a/media-libs/ming/ming-0.4.0_rc2.ebuild +++ b/media-libs/ming/ming-0.4.0_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.0_rc2.ebuild,v 1.9 2010/01/31 16:01:26 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.0_rc2.ebuild,v 1.10 2010/03/14 14:44:47 ssuominen Exp $ EAPI=1 @@ -38,6 +38,7 @@ RESTRICT="test" src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${PN}-0.4.x-libpng14.patch #Let's get rid of the TEXTRELS, link dynamic. Use gif. sed -i \ |