Add patch to fix rendering problems, bug #474670.

(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 107 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index ee3f0527b0a3..a635199abf6d 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.135 2013/06/23 18:55:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.136 2013/06/25 17:58:05 chithanh Exp $
+
+*xf86-video-intel-2.21.10-r1 (25 Jun 2013)
+
+  25 Jun 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-intel-2.21.10-sna-clear-clear-hint.patch,
+  +xf86-video-intel-2.21.10-r1.ebuild:
+  Add patch to fix rendering problems, bug #474670.
 
 *xf86-video-intel-2.21.10 (23 Jun 2013)
 
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.10-sna-clear-clear-hint.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.10-sna-clear-clear-hint.patch
new file mode 100644
index 000000000000..653295dabb46
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.10-sna-clear-clear-hint.patch
@@ -0,0 +1,30 @@
+From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 23 Jun 2013 21:01:12 +0000
+Subject: sna: Clear 'clear' hint upon uploading into tiled
+
+Fixes regression from
+commit 53c113c3cc2f8527debc185f0819139ca8637637 [2.21.10]
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Fri Jun 21 19:27:24 2013 +0100
+
+    sna: Allow PutImage to write inplace using manual tiling
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66059
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 0994c33..43d6a67 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -4000,6 +4000,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
+ 	} while (--n);
+ 	__kgem_bo_unmap__cpu(&sna->kgem, priv->gpu_bo, dst);
+ 
++	priv->clear = false;
++	priv->cpu = false;
+ 	return true;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.10-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.10-r1.ebuild
new file mode 100644
index 000000000000..23f8ed9d5388
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.10-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 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.21.10-r1.ebuild,v 1.1 2013/06/25 17:58:05 chithanh Exp $
+
+EAPI=5
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+IUSE="glamor +sna +udev uxa xvmc"
+
+REQUIRED_USE="|| ( glamor sna uxa )"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	glamor? (
+		x11-libs/glamor
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/resourceproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sna-clear-clear-hint.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable glamor)
+		$(use_enable sna)
+		$(use_enable uxa)
+		$(use_enable udev)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}