diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-02-15 20:15:21 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-02-15 20:15:21 +0000 |
| commit | bde27e60b11fd3f882f6cfaaeabb3be8cf7f5db5 (patch) | |
| tree | 0d02bc69625f0d0d073ff12c6fa0df50889e868f /media-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-bde27e60b11fd3f882f6cfaaeabb3be8cf7f5db5.tar.gz gentoo-2-bde27e60b11fd3f882f6cfaaeabb3be8cf7f5db5.tar.bz2 gentoo-2-bde27e60b11fd3f882f6cfaaeabb3be8cf7f5db5.zip | |
fix build with libpng 1.5
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/zvbi/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/zvbi/files/zvbi-0.2.33-libpng15.patch | 21 | ||||
| -rw-r--r-- | media-libs/zvbi/zvbi-0.2.33.ebuild | 5 |
3 files changed, 30 insertions, 4 deletions
diff --git a/media-libs/zvbi/ChangeLog b/media-libs/zvbi/ChangeLog index ce550b25db38..531c46fc4fc4 100644 --- a/media-libs/zvbi/ChangeLog +++ b/media-libs/zvbi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/zvbi -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.46 2010/08/20 13:46:36 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.47 2011/02/15 20:15:21 aballier Exp $ + + 15 Feb 2011; Alexis Ballier <aballier@gentoo.org> zvbi-0.2.33.ebuild, + +files/zvbi-0.2.33-libpng15.patch: + fix build with libpng 1.5 20 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> zvbi-0.2.33.ebuild, +files/zvbi-0.2.33-glibc212.patch: diff --git a/media-libs/zvbi/files/zvbi-0.2.33-libpng15.patch b/media-libs/zvbi/files/zvbi-0.2.33-libpng15.patch new file mode 100644 index 000000000000..2626773769c8 --- /dev/null +++ b/media-libs/zvbi/files/zvbi-0.2.33-libpng15.patch @@ -0,0 +1,21 @@ +Index: src/exp-gfx.c +=================================================================== +RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v +retrieving revision 1.16 +diff -u -B -r1.16 exp-gfx.c +--- src/exp-gfx.c 24 Feb 2008 14:17:47 -0000 1.16 ++++ src/exp-gfx.c 15 Feb 2011 20:03:58 -0000 +@@ -1672,11 +1672,11 @@ + char title[80]; + unsigned int i; + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + return FALSE; + + png_set_write_fn (png_ptr, +- (voidp) gfx, ++ (png_voidp) gfx, + write_data, + flush_data); + diff --git a/media-libs/zvbi/zvbi-0.2.33.ebuild b/media-libs/zvbi/zvbi-0.2.33.ebuild index fc147f4adda3..19becf7dc26f 100644 --- a/media-libs/zvbi/zvbi-0.2.33.ebuild +++ b/media-libs/zvbi/zvbi-0.2.33.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.10 2010/08/20 13:46:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.11 2011/02/15 20:15:21 aballier Exp $ EAPI=2 inherit eutils libtool @@ -26,6 +26,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-glibc212.patch + epatch "${FILESDIR}"/${P}-libpng15.patch elibtoolize } |