x11-drivers/xf86-video-intel: backport patch to fix Xv (fixes bug #261531)

Package-Manager: portage-2.2_rc26/cvs/Linux i686

4 files changed, 73 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index a0310c4b4dc7..e8a9e7b0bf4c 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.17 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.18 2009/03/21 00:59:35 remi Exp $
+
+*xf86-video-intel-2.6.3-r1 (21 Mar 2009)
+
+  21 Mar 2009; Rémi Cardona <remi@gentoo.org>
+  +files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch,
+  +xf86-video-intel-2.6.3-r1.ebuild:
+  backport patch to fix Xv (fixes bug #261531)
 
   13 Mar 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-intel-1.6.5.ebuild, xf86-video-intel-1.7.4.ebuild,
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index f0e9c1542b66..05a4503c0792 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -7,6 +7,7 @@ AUX 2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 R
 AUX 2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch 820 RMD160 6df19b267a211a1c013de7c1a302b73daeee74d7 SHA1 5345c0a409c2ca98ec2f315da152e175b49c6eb1 SHA256 5892c7acf43ac13ad032ace5dbaf4c3216a144b66be3757540b25cdd4cf31c9b
 AUX 2.6.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
 AUX 2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
+AUX 2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch 809 RMD160 6f6d7f25efddeb2db9d35e2ea92d408a54af5a56 SHA1 2208274bb58f76503cf2d10d236e6591c48681cf SHA256 4236e01b101a69ca27dfc9c06c367d2b0a381afa343dc3a2b65504559b24fc3c
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
 DIST xf86-video-i810-1.7.4.tar.bz2 461513 RMD160 cbb8ebd7e36d07513e00c232cbb1e0b12a0de3b2 SHA1 3c2837283ec3e9d1aeec430bb2460178aec94a90 SHA256 ff8cd89c9ba39ce68dd6ac4dcb222280835d007a20b419819749298e8ec74259
@@ -25,6 +26,7 @@ EBUILD xf86-video-intel-2.3.2.ebuild 777 RMD160 e40753dfa6539417b2cde2ae1b1b567e
 EBUILD xf86-video-intel-2.4.3.ebuild 794 RMD160 d3d5baf6086b8941915d2124684f05fe799f25b1 SHA1 ca4773472e79b3cb438ecce4c2c7b402e1324ba0 SHA256 f45782db5626cae39980cae4b743ac8e8bd7b4c274cc21d5950cfcf909bdd325
 EBUILD xf86-video-intel-2.5.1-r1.ebuild 898 RMD160 1c867b04bdd108d1195c1e7dc745af63587a2d7d SHA1 224b911ba59e15a5c0b805703c4de768bd0055d9 SHA256 14d170a92122e158fba45568d5519b2f435e63b81f6ea69e75997b726cb298b0
 EBUILD xf86-video-intel-2.6.1.ebuild 890 RMD160 cad7057d71d00738d1ee185e0e76ee00ceee9d0b SHA1 301cef9bb584cfb7a73115dbb16c6ab7827d4258 SHA256 4909fedf86658ef6eea0d806c6cd3453f103fc47804792e2add7b4a56f075b20
+EBUILD xf86-video-intel-2.6.3-r1.ebuild 953 RMD160 5e7de7c8866cf63785f818540cad4ad19736e551 SHA1 d92af7d7aa025646b6af2d467a5c05358bfb0fa5 SHA256 6ed450b6b7fc8c26ec8a831bc9922b12c5825ab4776f6dbab3f78744c694067f
 EBUILD xf86-video-intel-2.6.3.ebuild 890 RMD160 14c0166f53f2ebdec066faedd8322fbf8c3b57e3 SHA1 fe94ffdb2643dc04ded7bab016baaf6247190446 SHA256 461664cac49493a1f0cb76d01f7ce1868892c52d5f1879721ac81801bcad4fa5
-MISC ChangeLog 31027 RMD160 cf11838687a9e089342fbbc943171aebcc1dc608 SHA1 dc16184c78d165a300ca7fca109f8711b6b9d38b SHA256 18d012b013b7b3613e1561a0ed813ed26dd0a941456a5b7471d4a6974c904f98
+MISC ChangeLog 31257 RMD160 3fe5661a2e5d47793a8e1cd1a0739fea07f1fbc4 SHA1 25960802d705804d6cdd0429ef8a2ad5359eeb9e SHA256 99e4f95549b3ce2c3258d359dadede7ecfaf9e12ef01bd95be3ca800dc51dc05
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch b/x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch
new file mode 100644
index 000000000000..0c8ed8326795
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch
@@ -0,0 +1,27 @@
+From 2484b1ed2162c5b96173fd1b07ad3421d0dec5c2 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalev@smartlink.ee>
+Date: Fri, 13 Mar 2009 21:32:08 +0200
+Subject: [PATCH 2/2] Fix Xv crash with overlay video.
+
+Bug #20585.
+(cherry picked from commit 2026c57cf0a352d9e6f9d208cfb7d4d550614477)
+---
+ src/i830_video.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/i830_video.c b/src/i830_video.c
+index c9a0181..0698107 100644
+--- a/src/i830_video.c
++++ b/src/i830_video.c
+@@ -1404,7 +1404,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+ 	dst_base = pPriv->buf->virtual;
+     } else {
+ 	drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE);
+-	dst_base = pI830->FbBase + pPriv->buf->offset;
++	dst_base = pI830->FbBase;
+     }
+ 
+     if (pPriv->currentBuf == 0)
+-- 
+1.6.2
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..110d5768bba2
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild,v 1.1 2009/03/21 00:59:35 remi Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.5
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xineramaproto
+	x11-proto/glproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( 	x11-proto/xf86driproto
+			>=x11-libs/libdrm-2.4.5
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=(
+"${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
+"${FILESDIR}/${PV}-0002-Fix-Xv-crash-with-overlay-video.patch"
+)