Add patch to fix rendering problems, bug #474670.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

4 files changed, 110 insertions, 2 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/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 71760571bd13..ea1c3379751e 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,3 +1,4 @@
+AUX xf86-video-intel-2.21.10-sna-clear-clear-hint.patch 943 SHA256 33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1 SHA512 8de2268f3b8e7cf4af13b53836d45de237137ba925ff196803b873772fb7315a3d159941d66c95b8cce4d95a42933de55614fb123dbb00139761b4010e1432df WHIRLPOOL 5decb4a472144e4f5fc140730f0ce9727fbced1b5569d02cd2a3d47cbb0138628d888b2ff844a947db2ed134d5c439bb408c5084e324d309bd6f47e7b045f9ed
 DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
 DIST xf86-video-intel-2.20.13.tar.bz2 1649369 SHA256 0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3 SHA512 4f70ba1e794d26f8cbbb52c4936cfc8cdf4f43a353d9f921bf519a02a0c7f1b1eec6b3aa706ee6fc333a89b152416b9526f5d951ddea23ed70400e975c59febe WHIRLPOOL 101dff2402c75d0a48243ce1e3ac11e529f2d26a8d81321ae9ec528b6d35a3ed7647c342a2cf60389a69d677c29798c84e3252932b64f905966ef5af695cffbf
 DIST xf86-video-intel-2.21.10.tar.bz2 1905905 SHA256 7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6 SHA512 f80317c4bfef80dc5e32274d1fe6fe643eb2fdb9bfb999b092a227b53bc6bc01bfc0f3e67156daae9d83543ef437f8ffc4a52c686517ba1314296d6bedf74305 WHIRLPOOL 2cf1eb9f7f1be24585de8162452acc8d2812d2ac6cfd375cd0063665f535f05d4c1f20a8593cdeb31e389e4918faa7e69ae220664c79fea2cb9324995e005e14
@@ -11,6 +12,7 @@ DIST xf86-video-intel-2.21.9.tar.bz2 1735037 SHA256 1359cbc9e494a284faa52d1db83e
 DIST xf86-video-intel-2.9.1.tar.bz2 789001 SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 SHA512 62a7c1852b2d0b89be93536e7852caf398fc743e11a12c5071baed5e767b29c382ff5eb9d6c3ab453fc4d94aa16245b607ef33b94198bf7c7626746772fcc290 WHIRLPOOL 7e61c5d1396829aa354c9fdfbe5a21723171390d86b3307a2a331061e128a9866408993410090fe5d607609d245c55843633730bc4521e9cb0ec478c8d6ede1c
 EBUILD xf86-video-intel-2.19.0.ebuild 1397 SHA256 922046f7f3253a3e4dbbb8dffbbfdc455345a66c85eece1ef710c46ed44f5113 SHA512 c071158fae241dfa061a029168dc65527a3c57716d87c714d721a933d747c3fecf87bb30dc9c27d75a52cfb2bce2f2da9fb488b58e1c067c34d65abedc35392f WHIRLPOOL 4c8e832531631f432723fea23e7db7a54d957b42c2575e66e62a1cf13bba4fd5936c12bc79b54d0483fb82784368d7e997ae38c33aa28caf32ccac0e13669c9e
 EBUILD xf86-video-intel-2.20.13.ebuild 1515 SHA256 f896d7999de9993f4d79cab048b35980b8d2f6009426628df7b3378fdfe2a180 SHA512 2f16066a6cf096030d70e3439d04b4999c5fa7f693b3ee3e38d2cc59d1cc566577e827d807c028845a725dd10f46ee557f42804fd28b7ec0c5f2891778101573 WHIRLPOOL a9090c7e66733c7f8a4c5a80951d9da3652c37a96e6cc50d49765eafdee270df3c10b2c3608bf23adad2e3ac6825d02582330b21f4755c4b32206c41653d59fe
+EBUILD xf86-video-intel-2.21.10-r1.ebuild 1580 SHA256 b23cdfed8f66c01a27f42cb498c9982fb18e6a0bcc2368c3b309ecc237a1e96c SHA512 be05cd96cd2e49ccfdec59b6c10c9949acebb77a531a86f3855c56ee8e3428620669b4716bada68c09d7d12aaa14cb3f369c2b378d32c29c5d849f245cf9bfbc WHIRLPOOL fb3be8a24f0c0ca5b579a71eee5deac1887f57fdfa5c0ac1a9f96587892163bba8bb5a22c31dae490268a5cc87500f2b98a7a8b405f7e0e0c75f93d0d8e9713c
 EBUILD xf86-video-intel-2.21.10.ebuild 1513 SHA256 6de4ebc6e10a51caaef1a8dfd73bba326ebf471d360d4bcce3cee485cbad9f90 SHA512 9fc423b723dc179cad6c37b3ed8fe3101938bf86949c75b6ae23cf8758b1063712bbe8c2862890c541f7d79bc42b166bcabbe7a7054a8ab82994a2fa1f27e48c WHIRLPOOL 58783fd47bf8c1e8e3afdf279f98d8375148f085b4706af4bd41f85a99dc4d402869936e25b8099856032dc858b73e9d0b528442775a04352c6f1403ef07f27d
 EBUILD xf86-video-intel-2.21.3.ebuild 1512 SHA256 8ca50a9ea3d66193b1f1aba62156dec47b2ffbd90e176a5e213505acc59f1389 SHA512 a185a17c3b25dcb0651eed70cb1174f37b1b02964437edce47e72b43513e2450d6340fceb9a2626f44392789b115e8a75eb27aced00b289d776a2c2878f16438 WHIRLPOOL 9d287925df901372ead08d8737373a97601ddf0dd0ad10fb2b6adf3349fec0279591a5f7bd941817514a8f83d090f5aa233dd420a4ae79abd2daec0dc78c3900
 EBUILD xf86-video-intel-2.21.4.ebuild 1512 SHA256 57abe0d5ca7526c28a2a6062f46ddbf3cfc5a23bb3f44101a573f0c8d43ed7f2 SHA512 f5517b470f21ff1561216bef04b02107abcd1fda111f01026f8e2fe57ca3b24c8d20c942a742eb1b60b47cb6b8ad9b5fb9406ad6ee60a8235f229dc63bbfdf74 WHIRLPOOL ffb72381f43ef562d5ee8b4f40317367fb5c2728f4ddbab6c934de91b804946ee3a562e2345bc6ff61c8afeaefe1e09ff778349450dda4986e5024085c94af99
@@ -20,5 +22,5 @@ EBUILD xf86-video-intel-2.21.7.ebuild 1516 SHA256 c0fa15f658ceef503f26134071b545
 EBUILD xf86-video-intel-2.21.8.ebuild 1516 SHA256 9ef89e3bd700340aaa5b4197d116e3747ea50130814f3bf8a3bbd161455f017c SHA512 7388579b6855500be299f96faf58cd909507feee696f0fe729d05ad7572c40f041461bde46ee24e2c07780195c18134d91ae5319ff232e813c663e89f2d41825 WHIRLPOOL cf61ec2a3f2bd4d555fde7ab15b5f6dc0e3c26f9684e156598533b4b2b240297440658d3d07c4219c3866ca4e26f6fce3da9c1271eb8af510e74ad71f2d3a6cd
 EBUILD xf86-video-intel-2.21.9.ebuild 1512 SHA256 d0e190192ae8027b9636e274ce28d287f9435be76f41eca1e6487593e9496906 SHA512 3caae53b4ced3576eeb7147e38a555d9730d77586d7fa96d2a32b0224a4d4cfff4b138bbf5e4b3b4386ec28bdbd492e3420d863b0fdb7112619922ce6ce69db3 WHIRLPOOL 509e8fa1a21400effda352fb108d7bb23b8737abbc5c1add4dd799a0f2c6223693e9629b60ab273b55603da5f875653c32c4b82074a5426818bb337ac610ed15
 EBUILD xf86-video-intel-2.9.1.ebuild 776 SHA256 4c1d2a0b50b0f4355e894395db96d4f975a52f42ef38a7ea29da7740ee61e86b SHA512 d021f1aaacc24581dff5851ba613ce980e437ca8640037acf02a54a4c4e13c7b60df21f94ee93e4402e481ac67c4c94fd57806749393f5719573a9e77110f845 WHIRLPOOL c28e1ce131b3fd3d122450ce8f23c21665282415d0ec9ca81aac48e764462d449691c334e86e42b223a3c0f8ccea32820c5e1b8e47802a305589725fb39a5109
-MISC ChangeLog 54485 SHA256 5c5ab9504318bb442c1aef249b99061fb47cbb396ee1d0e728ac4b9e2bf79c90 SHA512 4f7941baa5392ca7cbe386c7b80a148396d212b4aa50c2a09b5badfaf51e2762d0022cd87816c878eead9f519a6c95bccf86d9c7be1fdf4c79dc67f27665e68a WHIRLPOOL 116cbd49f1c3bd59538ff7da743b5e7f608a73a46b51a25848d1e1b7181d4d8eddb1766313242f3a7d3ee92dfa88a1821464729ce3a2ffcec1a625f7259fc341
+MISC ChangeLog 54756 SHA256 c442888765c23bb687a85b67408d749a2ab9c3de4fb935c2ebc3659b45197fe7 SHA512 72a4bf5807a3f0c0bcffeb42a593ab21ef9f61a51b12a9608df2ff1c6126bcfdad118d51437f3be15a317490dca562a4a3e760c06bc0dfca0dab93a93aff7168 WHIRLPOOL c1777d4fa701fd7ce48fe01ae446014ccf5635c0db35e94e780e6a806b4dbc6b69d3f71fd6fc9d095212d76426e199cd9394981902a23e5a8aa6c4910d45843b
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
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
+}