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

Package-Manager: portage-2.1.4_rc11

5 files changed, 100 insertions, 15 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/Manifest b/x11-drivers/xf86-video-i810/Manifest
index 2e85d7168b07..2305c22e7c77 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
 MD5 2208ca768eace896ac5d3a762c3045c8 files/1.6.5-fix_no_dri.patch 1236
 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 files/1.6.5-fix_no_dri.patch 1236
@@ -17,6 +14,10 @@ AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f
 MD5 a7f1da50867a369008e22efbbcc8b7db files/i810.xinf 1442
 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 files/i810.xinf 1442
 SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347 files/i810.xinf 1442
+AUX xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018 RMD160 1b989baf999dc8c8697fa1624d079dbb1e704a04 SHA1 a8a15459796be87640861a2028864e1012f3a9af SHA256 ab7253f729c82b049439e3110df11910c31c0d0ef37e4145b573d0511ada9db8
+MD5 7ec2441ae917312d224790f766bc2944 files/xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018
+RMD160 1b989baf999dc8c8697fa1624d079dbb1e704a04 files/xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018
+SHA256 ab7253f729c82b049439e3110df11910c31c0d0ef37e4145b573d0511ada9db8 files/xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST x11-driver-patches-3.tar.bz2 404 RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff SHA1 ea479b7a3bc1400fad443801887f593d9eb11084 SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a
 DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
@@ -50,14 +51,18 @@ EBUILD xf86-video-i810-2.1.99.ebuild 1105 RMD160 2af2edf9f962a3979d5cc1476f20f95
 MD5 8a147350d8fefab5f6c366a177de15b5 xf86-video-i810-2.1.99.ebuild 1105
 RMD160 2af2edf9f962a3979d5cc1476f20f95b49adfcd0 xf86-video-i810-2.1.99.ebuild 1105
 SHA256 850eb92e2365fbd7e552b50208bee830ba7a849423337c3240b8d42bd782a319 xf86-video-i810-2.1.99.ebuild 1105
+EBUILD xf86-video-i810-2.2.0-r1.ebuild 1244 RMD160 69ab15b2e87269fbd80138a8182d0fbe84e749e6 SHA1 167ed90654833d1f64b2b6bed9679c96862cfcb8 SHA256 4708403cc231a121bc2723ddac8c2877dc6455695f9bd534fe31449d654fb2e6
+MD5 ae5e81b4bef8dabddd9d745f9e4293ff xf86-video-i810-2.2.0-r1.ebuild 1244
+RMD160 69ab15b2e87269fbd80138a8182d0fbe84e749e6 xf86-video-i810-2.2.0-r1.ebuild 1244
+SHA256 4708403cc231a121bc2723ddac8c2877dc6455695f9bd534fe31449d654fb2e6 xf86-video-i810-2.2.0-r1.ebuild 1244
 EBUILD xf86-video-i810-2.2.0.ebuild 1140 RMD160 30532b690fe1624268cd922d0a7b2e9c928e9799 SHA1 f24dd540b0cde5eaf9aa839b4cb4f4d9a0986cc1 SHA256 0e89526773697fa97f3b759a08b01864e766202b4b75d8d86088ac50cbc0fd54
 MD5 797cd40140b40235fd46fdc75d592494 xf86-video-i810-2.2.0.ebuild 1140
 RMD160 30532b690fe1624268cd922d0a7b2e9c928e9799 xf86-video-i810-2.2.0.ebuild 1140
 SHA256 0e89526773697fa97f3b759a08b01864e766202b4b75d8d86088ac50cbc0fd54 xf86-video-i810-2.2.0.ebuild 1140
-MISC ChangeLog 12323 RMD160 14ec3442468c27cb7bd655b8176687dccdc4a338 SHA1 37fe421e6e223211901eb105ff707d4c46d48d5a SHA256 b92056dd6b2932432d33103f98b455979f08be515a9b5b5cb9eeeb4b8f6517d1
-MD5 ea5734727ba532885738b79a2b9d2f4a ChangeLog 12323
-RMD160 14ec3442468c27cb7bd655b8176687dccdc4a338 ChangeLog 12323
-SHA256 b92056dd6b2932432d33103f98b455979f08be515a9b5b5cb9eeeb4b8f6517d1 ChangeLog 12323
+MISC ChangeLog 12551 RMD160 7e3cc087244752aecf3773ef4442988009f2436d SHA1 d51b48d5a89c596f93321ecd5609b3f7b21102d9 SHA256 3a7fc7bffd80617fbc6ec135db000292990bbbeec5fe4d41c358533ea8333671
+MD5 3c774c2587dab9c259356e1a90156352 ChangeLog 12551
+RMD160 7e3cc087244752aecf3773ef4442988009f2436d ChangeLog 12551
+SHA256 3a7fc7bffd80617fbc6ec135db000292990bbbeec5fe4d41c358533ea8333671 ChangeLog 12551
 MISC metadata.xml 248 RMD160 1bc22252fb59ed171fe013e765baa171151843cf SHA1 1df26c31e85768bb440888be23ba6fdcb421843d SHA256 a52fe0f6937ba347182a10ae3c710ee5524086af9b011567f5629ba165bf7dcd
 MD5 9739cf35f0671c04c5d300e32b32e746 metadata.xml 248
 RMD160 1bc22252fb59ed171fe013e765baa171151843cf metadata.xml 248
@@ -83,10 +88,6 @@ SHA256 b4c6b845007767130c6f974e7149ccbfa5351da4da8b815cc6ce80482ca63c89 files/di
 MD5 d355560c22c54c77fb5bd39acad9e4a5 files/digest-xf86-video-i810-2.2.0 271
 RMD160 44a597a41d10c5f1164f61023023a480fb69445c files/digest-xf86-video-i810-2.2.0 271
 SHA256 5820877be3c0a8795f247d9a1ebb748de550e418e13157da607844c020bffc61 files/digest-xf86-video-i810-2.2.0 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHabfvUPEOwClectkRAlh7AJ9RbFjyhyDXnt/1lOeTTwNhn3kLOgCfSYXa
-5TVSd+x6ScaRxewB4Ml824c=
-=yxEi
------END PGP SIGNATURE-----
+MD5 d355560c22c54c77fb5bd39acad9e4a5 files/digest-xf86-video-i810-2.2.0-r1 271
+RMD160 44a597a41d10c5f1164f61023023a480fb69445c files/digest-xf86-video-i810-2.2.0-r1 271
+SHA256 5820877be3c0a8795f247d9a1ebb748de550e418e13157da607844c020bffc61 files/digest-xf86-video-i810-2.2.0-r1 271
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
+}