x11-drivers/xf86-video-i810: add patch to try to fix flickering

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r3 i686

4 files changed, 118 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 24ffb5fca578..a9fe09134651 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.104 2008/08/29 22:41:13 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.105 2008/09/02 20:09:08 remi Exp $
+
+*xf86-video-i810-2.4.2-r1 (02 Sep 2008)
+
+  02 Sep 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.4.2-fix-flicker.patch,
+  +xf86-video-i810-2.4.2-r1.ebuild:
+  add patch to try to fix flickering
 
 *xf86-video-i810-2.4.2 (29 Aug 2008)
 
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index 9907e29e6154..96e82949c6bf 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -4,6 +4,7 @@ AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 AUX xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
 AUX xf86-video-i810-2.4.1-0001-Fix-reverted-LVDS-bios-capability-dword-definition.patch 1049 RMD160 8e278bd519edf92f3c1d6e80fab658939fdf9400 SHA1 d473234a28a8132c33ab29482828f701aeee9538 SHA256 71fbcde047e1bd7e7fe6096335f452364644346bc672271d95b9451f9efeb0e3
+AUX xf86-video-i810-2.4.2-fix-flicker.patch 1566 RMD160 99592f0326de8d479ab35a0b5e217d31695e7b08 SHA1 bdc21f7427487158b3c5b9c1e89ae36cea6a72d7 SHA256 4b2327b95bc2fb3bc487b5c47086dab9ba057f34403ceab192e0d1e531eaabe9
 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
 DIST xf86-video-intel-2.1.1.tar.bz2 584729 RMD160 47596231378bed5c9a48511318b6e56ab184f319 SHA1 5a4e6205818ddd8fc8529e2bd5f6310fdc247f84 SHA256 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c
@@ -22,6 +23,7 @@ EBUILD xf86-video-i810-2.3.2.ebuild 1243 RMD160 a181cae7052a45d4c0d311c0bfbffb00
 EBUILD xf86-video-i810-2.4.0.ebuild 1180 RMD160 633eba78ab222a0390fbf9780c60fc686c5eac5a SHA1 7133103f35d9d6b6e7a7e60ba8c9314128cb9151 SHA256 fcec2f0345c9f1fd3496f8d356f044fc453b9013d6788a2b7457300cc0cb5bd0
 EBUILD xf86-video-i810-2.4.1-r1.ebuild 1277 RMD160 77271530c3b09648f9360f185c803a5948fc1a9e SHA1 bda31fba56eae732a9d254cf7441d21e6f8227d2 SHA256 72af21c69fc97cd2e50c6751dde10bede21cffed467da7a0214f7cadb949a5f6
 EBUILD xf86-video-i810-2.4.1.ebuild 1180 RMD160 0523d9342b9626c7818d7eebbdabf4100130ee49 SHA1 35b86dce827ee2d6b08bfb3eaa40fef3e67552c3 SHA256 394af645527baf5ac6969e6a2f7a6d806e4c17d75aa81c04d3ec07976c63fa18
+EBUILD xf86-video-i810-2.4.2-r1.ebuild 1233 RMD160 bc5d7293deabc5136bcdd69e1c009f3239c19fa2 SHA1 1445d38eb3b5cdc39ac32fecdec205c5ad88bf97 SHA256 08326802dd435878322cb4a659295d4d6b891264e522f40c36f350851f31843d
 EBUILD xf86-video-i810-2.4.2.ebuild 1180 RMD160 785c24402e40575a01a06c7e872defd22ec99116 SHA1 ffb156bcdd1544155d5a9c4a5b835164f9676992 SHA256 d9801dd2cddcbf313282cec2bf3842b3bcc1317a97ebc82963c2070f3f27587b
-MISC ChangeLog 23797 RMD160 868412903f8d87aae6d7204e7fa3bc748192668a SHA1 9569d8c54d993cc6b500fbe2a2be300f353d4b00 SHA256 249ab63bad4c3f15bf74d8828ab851eb48c0bf9c955ce5b2283fe43c350ce8b3
+MISC ChangeLog 24009 RMD160 48759f47681bd82c8f7aa9beb1ed3284a1f3f8d3 SHA1 27dfa41d9acdc4bca0c6bd1fd123bcdb3bd89c10 SHA256 a9c095d6353a566ab316ddba7534403a105cc68e1e84ba37571d49961ec540ed
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.4.2-fix-flicker.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.4.2-fix-flicker.patch
new file mode 100644
index 000000000000..0e7de65357e9
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.4.2-fix-flicker.patch
@@ -0,0 +1,60 @@
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed, 20 Aug 2008 21:40:29 +0000 (-0700)
+Subject: Don't allocate a pipe for hotplug detection
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=7b6f4d22211d71480caf6335a3eacaacff369371
+
+Don't allocate a pipe for hotplug detection
+
+It shouldn't be needed...
+---
+
+--- a/src/i830_crt.c
++++ b/src/i830_crt.c
+@@ -352,10 +352,9 @@ i830_crt_detect(xf86OutputPtr output)
+     xf86OutputStatus	    status;
+     Bool		    connected;
+ 
+-    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
+-    if (!crtc)
+-	return XF86OutputStatusUnknown;
+-
++    /*
++     * Try hotplug detection where supported
++     */
+     if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
+ 	    IS_G33CLASS(pI830)) {
+ 	if (i830_crt_detect_hotplug(output))
+@@ -363,12 +362,19 @@ i830_crt_detect(xf86OutputPtr output)
+ 	else
+ 	    status = XF86OutputStatusDisconnected;
+ 
+-	goto out;
++	goto done;
+     }
+ 
++    /*
++     * DDC is next best, no flicker
++     */
++    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
++    if (!crtc)
++	return XF86OutputStatusUnknown;
++
+     if (i830_crt_detect_ddc(output)) {
+ 	status = XF86OutputStatusConnected;
+-	goto out;
++	goto out_release_pipe;
+     }
+ 
+     /* Use the load-detect method if we have no other way of telling. */
+@@ -378,9 +384,10 @@ i830_crt_detect(xf86OutputPtr output)
+     else
+ 	status = XF86OutputStatusDisconnected;
+ 
+-out:
++out_release_pipe:
+     i830ReleaseLoadDetectPipe (output, dpms_mode);
+ 
++done:
+     return status;
+ }
+ 
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.4.2-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..fda1e82edeed
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.4.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 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.4.2-r1.ebuild,v 1.1 2008/09/02 20:09:08 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
+
+# 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/xineramaproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			x11-proto/glproto
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=(
+"${FILESDIR}/${P}-fix-flicker.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
+}