diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 17:09:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 17:09:55 +0000 |
| commit | 5d57b65140872508eef655a3281e245bcc4d323c (patch) | |
| tree | 8de439a82addd321f9e33370a4bd38a2059c3fa3 /media-video/dvdauthor | |
| parent | Big leechcraft bump, 0.4.90 (diff) | |
| download | gentoo-2-5d57b65140872508eef655a3281e245bcc4d323c.tar.gz gentoo-2-5d57b65140872508eef655a3281e245bcc4d323c.tar.bz2 gentoo-2-5d57b65140872508eef655a3281e245bcc4d323c.zip | |
Fix building with libpng15 (again, restore dropped patch) wrt #355039 by Hanno Boeck
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-video/dvdauthor')
| -rw-r--r-- | media-video/dvdauthor/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/dvdauthor/dvdauthor-0.6.18.ebuild | 19 | ||||
| -rw-r--r-- | media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch | 19 |
3 files changed, 36 insertions, 9 deletions
diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog index 2da5505e2016..947493b2d1e3 100644 --- a/media-video/dvdauthor/ChangeLog +++ b/media-video/dvdauthor/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/dvdauthor # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.32 2011/09/13 00:32:26 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.33 2011/09/14 17:09:55 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> dvdauthor-0.6.18.ebuild, + +files/dvdauthor-0.6.18-libpng15.patch: + Fix building with libpng15 (again, restore dropped patch) wrt #355039 by + Hanno Boeck *dvdauthor-0.6.18 (13 Sep 2011) diff --git a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild b/media-video/dvdauthor/dvdauthor-0.6.18.ebuild index b156498bec11..66d3fee9c05a 100644 --- a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild +++ b/media-video/dvdauthor/dvdauthor-0.6.18.ebuild @@ -1,28 +1,31 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.18.ebuild,v 1.1 2011/09/13 00:32:27 beandog Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.18.ebuild,v 1.2 2011/09/14 17:09:55 ssuominen Exp $ +EAPI=4 inherit eutils DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players" HOMEPAGE="http://dvdauthor.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND="media-libs/libdvdread + +RDEPEND="media-libs/libdvdread >=media-gfx/imagemagick-5.5.7.14 >=dev-libs/libxml2-2.6.0 media-libs/freetype dev-libs/fribidi media-libs/libpng" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${PN} -S="${WORKDIR}/${PN}" +DOCS=( AUTHORS ChangeLog README TODO ) -src_install() { - emake install DESTDIR="${D}" || die - dodoc README TODO ChangeLog AUTHORS +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch } diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch b/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch new file mode 100644 index 000000000000..6ecd44c1e8d2 --- /dev/null +++ b/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch @@ -0,0 +1,19 @@ +--- src/spuunmux.c ++++ src/spuunmux.c +@@ -37,6 +37,7 @@ + + #include <netinet/in.h> + ++#include <zlib.h> + #include <png.h> + + #include "rgb.h" +@@ -483,7 +484,7 @@ + return -1; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); + return -1; |