x11-drivers/xf86-video-i810: Add patch from git HEAD to fix XVideo support

(Portage version: 2.1.4_rc11)

4 files changed, 85 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 7c6e11ee42c0..c8d82caef2ce 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.67 2007/12/20 00:31:38 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.68 2007/12/27 16:36:52 remi Exp $
+
+*xf86-video-i810-2.2.0-r1 (27 Dec 2007)
+
+  27 Dec 2007; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.2.0-fix_xv_segfault.patch,
+  +xf86-video-i810-2.2.0-r1.ebuild:
+  Add patch from git HEAD to fix XVideo support
 
   19 Dec 2007; Dawid Węgliński <cla@gentoo.org>
   xf86-video-i810-2.1.1.ebuild:
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-2.2.0-r1 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-2.2.0-r1
new file mode 100644
index 000000000000..be0697d0a55f
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-2.2.0-r1
@@ -0,0 +1,3 @@
+MD5 e90d44adc819e8c5c76a1abde525a963 xf86-video-intel-2.2.0.tar.bz2 596840
+RMD160 728dc77903649af7ad3d26d20f0000801c7e5c85 xf86-video-intel-2.2.0.tar.bz2 596840
+SHA256 73474a5c9224fdb65b420aef9e116cc573a5e050b078b54cfe4753f94fcc510b xf86-video-intel-2.2.0.tar.bz2 596840
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.0-fix_xv_segfault.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.0-fix_xv_segfault.patch
new file mode 100644
index 000000000000..af849a45718c
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.0-fix_xv_segfault.patch
@@ -0,0 +1,28 @@
+From: Michel Dänzer <michel@tungstengraphics.com>
+Date: Tue, 18 Dec 2007 18:37:46 +0000 (+0100)
+Subject: Always set pPriv->buf to NULL after freeing the memory it pointed to.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=4757a218d733af12d04674455fc6e1fad48a1cd0
+
+Always set pPriv->buf to NULL after freeing the memory it pointed to.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13108 .
+---
+
+--- a/src/i830_video.c
++++ b/src/i830_video.c
+@@ -2574,6 +2574,7 @@ I830VideoBlockHandler(int i, pointer blo
+ 		 */
+ 		I830Sync(pScrn);
+ 		i830_free_memory(pScrn, pPriv->buf);
++		pPriv->buf = NULL;
+ 		pPriv->videoStatus = 0;
+ 	    }
+ 	}
+@@ -2686,6 +2687,7 @@ I830FreeSurface(XF86SurfacePtr surface)
+     /* Sync before freeing the buffer, because the pages will be unbound. */
+     I830Sync(pScrn);
+     i830_free_memory(surface->pScrn, pPriv->buf);
++    pPriv->buf = NULL;
+     xfree(surface->pitches);
+     xfree(surface->offsets);
+     xfree(surface->devPrivate.ptr);
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..fe5cc78d4bbd
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild,v 1.1 2007/12/27 16:36:52 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+#SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular eutils
+
+# This really needs a pkgmove...
+SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
+
+S="${WORKDIR}/xf86-video-intel-${PV}"
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+src_unpack() {
+	x-modular_unpack_source
+	epatch "${FILESDIR}/${PN}-2.2.0-fix_xv_segfault.patch"
+}
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}