diff options
| author |   Tavis Ormandy <taviso@gentoo.org> | 2005-10-12 16:13:13 +0000 |
|---|---|---|
| committer | Tavis Ormandy <taviso@gentoo.org> | 2005-10-12 16:13:13 +0000 |
| commit | 7f9b4ac363ae5bcae8673682379ec9b6de7d6cf4 (patch) | |
| tree | 86644107ab4d793570daa7cfa83e8fbfd9397e26 /media-gfx | |
| parent | Marked ppc stable for bug #108411. (diff) | |
| download | gentoo-2-7f9b4ac363ae5bcae8673682379ec9b6de7d6cf4.tar.gz gentoo-2-7f9b4ac363ae5bcae8673682379ec9b6de7d6cf4.tar.bz2 gentoo-2-7f9b4ac363ae5bcae8673682379ec9b6de7d6cf4.zip | |
fix bug #109012
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/xv/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/xv/files/jumbo-patch-nojpeg.diff | 11 | ||||
| -rw-r--r-- | media-gfx/xv/xv-3.10a-r12.ebuild | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog index 3307c3bd105c..f2ac250453a6 100644 --- a/media-gfx/xv/ChangeLog +++ b/media-gfx/xv/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/xv # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.68 2005/10/11 15:31:58 hardave Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.69 2005/10/12 16:13:13 taviso Exp $ + + 12 Oct 2005; Tavis Ormandy <taviso@gentoo.org> + +files/jumbo-patch-nojpeg.diff, xv-3.10a-r12.ebuild: + fix installation without jpeg support, many thanks to Tim Ramsey. + (bug #109012) 11 Oct 2005; Hardave Riar <hardave@gentoo.org> xv-3.10a-r12.ebuild: Stable on mips. diff --git a/media-gfx/xv/files/jumbo-patch-nojpeg.diff b/media-gfx/xv/files/jumbo-patch-nojpeg.diff new file mode 100644 index 000000000000..cf45ab7064fb --- /dev/null +++ b/media-gfx/xv/files/jumbo-patch-nojpeg.diff @@ -0,0 +1,11 @@ +--- xv-3.10a-jumbo-enh-patch-20050501.txt.orig 2005-05-01 15:51:22.000000000 -0500 ++++ xv-3.10a-jumbo-enh-patch-20050501.txt 2005-10-12 10:08:39.000000000 -0500 +@@ -7503,7 +7503,7 @@ + if (wasTiffUp) { TIFFDialog(wasTiffUp); wasTiffUp=0; } + #endif + +#ifdef HAVE_PNG +-+ if (wasPngUp) { PNGDialog(wasJpegUp); wasPngUp=0; } +++ if (wasPngUp) { PNGDialog(wasPngUp); wasPngUp=0; } + +#endif + +#ifdef HAVE_PCD + + if (wasPcdUp) { PCDDialog(wasPcdUp); wasPcdUp=0; } diff --git a/media-gfx/xv/xv-3.10a-r12.ebuild b/media-gfx/xv/xv-3.10a-r12.ebuild index e9795776302b..e16f8e908388 100644 --- a/media-gfx/xv/xv-3.10a-r12.ebuild +++ b/media-gfx/xv/xv-3.10a-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.7 2005/10/11 15:31:58 hardave Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.8 2005/10/12 16:13:13 taviso Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -22,6 +22,9 @@ DEPEND="virtual/x11 src_unpack() { unpack ${A} + # bug #109012 + cd ${WORKDIR}; epatch ${FILESDIR}/jumbo-patch-nojpeg.diff || die + cd ${S} # XXX: fix version on subsequent releases. |