fix bug #109012

Package-Manager: portage-2.0.51.19

4 files changed, 34 insertions, 14 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/Manifest b/media-gfx/xv/Manifest
index 0c822688c224..ff15d812eaba 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,25 +1,26 @@
-MD5 ba9562b902681c97e5f2a27f3d18b3ba ChangeLog 10271
-MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
-MD5 2954b497004732142fd6d69104cf2499 xv-3.10a-r10.ebuild 2689
 MD5 e85f1a876b925f9a8b4a29eabc3e3788 xv-3.10a-r11.ebuild 2321
-MD5 6f24a0366b1a69dc2a948ac0b2edb637 xv-3.10a-r12.ebuild 2117
-MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
 MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
-MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127
-MD5 6f7117c9be7e979494866250a24a3338 files/digest-xv-3.10a-r11 145
-MD5 bf64513c42257ec1f60b78efabf94e6e files/digest-xv-3.10a-r12 145
+MD5 2954b497004732142fd6d69104cf2499 xv-3.10a-r10.ebuild 2689
+MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
+MD5 fff7d83ecfd2ac009ca7a0ebb021589b xv-3.10a-r12.ebuild 2198
+MD5 f3732946526481cab07b9c8ec40a04f8 ChangeLog 10459
+MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
+MD5 d5c3a8ae96703604cb323e57a7e8e554 files/jumbo-patch-nojpeg.diff 469
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127
-MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249
 MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
-MD5 5abcdae2ed559d5909856a83ab102180 files/xv-3.10a-r11-xv-osx.patch 1088
+MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249
 MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079
+MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127
+MD5 6f7117c9be7e979494866250a24a3338 files/digest-xv-3.10a-r11 145
+MD5 bf64513c42257ec1f60b78efabf94e6e files/digest-xv-3.10a-r12 145
+MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
 MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341
 MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615
 MD5 4e152e258221470988e2fc31bd8e03d5 files/xv-3.10a-yaos.dif.bz2 4212
+MD5 5abcdae2ed559d5909856a83ab102180 files/xv-3.10a-r11-xv-osx.patch 1088
+MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
 MD5 63deb1e35f05b4f406f141d1e48ff17b files/xv-filename-format-string.diff 319
 MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553
 MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864
-MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
-MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
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.