Patch added as per bug 78015

(Portage version: 2.0.51-r15)

5 files changed, 42 insertions, 5 deletions

diff --git a/media-gfx/fbv/ChangeLog b/media-gfx/fbv/ChangeLog
index 7d40c059fe3b..11455e60d52f 100644
--- a/media-gfx/fbv/ChangeLog
+++ b/media-gfx/fbv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.6 2005/01/26 20:29:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.7 2005/01/30 08:31:51 dragonheart Exp $
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/oob-segfault-fbv-1.0b.diff, fbv-1.0b.ebuild, +metadata.xml:
+  Patch added as per bug 78015. Thanks to Philip Nilsson <leffeman@gmail.com>
 
   26 Jan 2005; Markus Rothe <corsair@gentoo.org> fbv-0.99.ebuild:
   Stable on ppc64
diff --git a/media-gfx/fbv/Manifest b/media-gfx/fbv/Manifest
index d0b8aa40055b..8df2f66fc486 100644
--- a/media-gfx/fbv/Manifest
+++ b/media-gfx/fbv/Manifest
@@ -1,5 +1,6 @@
 MD5 3d4f0f688850670b57cad889918cc68c ChangeLog 952
 MD5 b0309a5b44d34e2e1a5a4d4e75d677d9 fbv-0.99.ebuild 1009
-MD5 0f5c383081f83e1c590a3e59b460ae81 fbv-1.0b.ebuild 1014
-MD5 fddf15ff0ff3ee14782881f4425e8b36 files/digest-fbv-0.99 59
+MD5 99208a61a94c0fac95a790e2a3a13b5d fbv-1.0b.ebuild 1128
 MD5 d0fa687199799a3f1c51f0bbbb3a0be3 files/digest-fbv-1.0b 59
+MD5 fddf15ff0ff3ee14782881f4425e8b36 files/digest-fbv-0.99 59
+MD5 c646a46a19f73a342c92c6f3cb003193 files/oob-segfault-fbv-1.0b.diff 559
diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild
index 6cca80c05ada..900169b04cc9 100644
--- a/media-gfx/fbv/fbv-1.0b.ebuild
+++ b/media-gfx/fbv/fbv-1.0b.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.1 2005/01/03 22:22:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.2 2005/01/30 08:31:51 dragonheart Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="simple program to view pictures on a linux framebuffer device"
 HOMEPAGE="http://s-tech.elsat.net.pl/fbv/"
@@ -17,6 +17,12 @@ DEPEND="gif? ( media-libs/libungif )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/oob-segfault-fbv-${PV}.diff || die "bad patch"
+}
+
 src_compile() {
 	local myconf
 
diff --git a/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff b/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff
new file mode 100644
index 000000000000..8713cb6635a8
--- /dev/null
+++ b/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff
@@ -0,0 +1,13 @@
+Index: fb_display.c
+===================================================================
+--- fb_display.c	(revision 4)
++++ fb_display.c	(working copy)
+@@ -92,7 +92,7 @@
+ #if 0
+     blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs, bp);
+ #else
+-    blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres_virtual, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp);
++    blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp);
+ #endif
+     free(fbbuff);
+    
diff --git a/media-gfx/fbv/metadata.xml b/media-gfx/fbv/metadata.xml
new file mode 100644
index 000000000000..4a70cde300d5
--- /dev/null
+++ b/media-gfx/fbv/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>dragonheart@gentoo.org</email>
+    <name>Daniel Black</name>
+    <description>A ebuild that I put a little bit of effort into maintaining and got lumped with it. 
+	Please take over if you want it (or not)
+    </description>
+</maintainer>
+<longdescription></longdescription>
+</pkgmetadata>