diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 08:52:31 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 08:52:31 +0000 |
| commit | 3f8768cfa6ab26320983089dd0587a0e391607dd (patch) | |
| tree | d97adde6f5b640d954a8d3e0bee9434f0134180f /media-sound | |
| parent | Fix building with libpng15 wrt #378735 by Diego Elio Pettenò (diff) | |
| download | gentoo-2-3f8768cfa6ab26320983089dd0587a0e391607dd.tar.gz gentoo-2-3f8768cfa6ab26320983089dd0587a0e391607dd.tar.bz2 gentoo-2-3f8768cfa6ab26320983089dd0587a0e391607dd.zip | |
Fix building with libpng15 wrt #380679 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/gqmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch | 11 | ||||
| -rw-r--r-- | media-sound/gqmpeg/gqmpeg-0.91.1.ebuild | 15 |
3 files changed, 26 insertions, 6 deletions
diff --git a/media-sound/gqmpeg/ChangeLog b/media-sound/gqmpeg/ChangeLog index 4f3a5d5199d3..9b8365584508 100644 --- a/media-sound/gqmpeg/ChangeLog +++ b/media-sound/gqmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/gqmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/ChangeLog,v 1.26 2011/08/25 20:39:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/ChangeLog,v 1.27 2011/09/14 08:52:30 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> gqmpeg-0.91.1.ebuild, + +files/gqmpeg-0.91.1-libpng15.patch: + Fix building with libpng15 wrt #380679 by Diego Elio Pettenò 25 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> gqmpeg-0.91.1.ebuild: QA: add missing libpng dependency. diff --git a/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch b/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch new file mode 100644 index 000000000000..f89565b30e10 --- /dev/null +++ b/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch @@ -0,0 +1,11 @@ +--- src/ui_pixbuf_save.c ++++ src/ui_pixbuf_save.c +@@ -86,7 +86,7 @@ gboolean pixbuf_to_file_as_png (GdkPixbu + return FALSE; + } + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (handle); diff --git a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild index 4afe0b81e1a6..43b5e796a46b 100644 --- a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild +++ b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.11 2011/08/25 20:39:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.12 2011/09/14 08:52:30 ssuominen Exp $ -EAPI=2 +EAPI=4 +inherit eutils DESCRIPTION="front end to various audio players, including mpg123" HOMEPAGE="http://gqmpeg.sourceforge.net" @@ -13,19 +14,23 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux" IUSE="nls" -RDEPEND=">=x11-libs/gtk+-2.2:2 +RDEPEND="x11-libs/gtk+:2 media-sound/vorbis-tools media-sound/mpg123 - media-libs/libpng" + >=media-libs/libpng-1.4" DEPEND="${RDEPEND} dev-util/pkgconfig nls? ( sys-devel/gettext )" +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch +} + src_configure() { econf $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog FAQ NEWS README SKIN-SPECS* TODO } |