summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-10-16 22:31:06 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-10-16 22:31:06 +0000
commit3e49966c369958758aee6cd5b5b0e824318cf893 (patch)
treefc998ebdebb18563fe627fa3008414ac09cd99a5 /x11-drivers
parentversion bump (diff)
downloadhistorical-3e49966c369958758aee6cd5b5b0e824318cf893.tar.gz
historical-3e49966c369958758aee6cd5b5b0e824318cf893.tar.bz2
historical-3e49966c369958758aee6cd5b5b0e824318cf893.zip
Version bump.
Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-intel/ChangeLog9
-rw-r--r--x11-drivers/xf86-video-intel/Manifest5
-rw-r--r--x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.10-filter-blend-flags.patch36
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.20.10.ebuild69
4 files changed, 117 insertions, 2 deletions
diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index e11028b14d85..52bd94219483 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.105 2012/09/30 12:07:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.106 2012/10/16 22:31:03 chithanh Exp $
+
+*xf86-video-intel-2.20.10 (16 Oct 2012)
+
+ 16 Oct 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +files/xf86-video-intel-2.20.10-filter-blend-flags.patch,
+ +xf86-video-intel-2.20.10.ebuild:
+ Version bump.
*xf86-video-intel-2.20.9 (30 Sep 2012)
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 16d05fa4a467..961914de76de 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -3,6 +3,7 @@ AUX xf86-video-intel-2.15-batch-overrun.patch 882 SHA256 5044689aaefa4c3416c8e8d
AUX xf86-video-intel-2.15-unsigned-promotion.patch 1207 SHA256 c61713af565c8ce55d4c00dbfe24380ed6952698df1bf3070813db953b979102 SHA512 4610223a9e2cf0f3ad8a6bf450285f6b76701b69630187201b93600075585e937cb5508aeb4e1f904e2e064c2c70b6dcad8677b964d9f951d00e91a78d6da711 WHIRLPOOL 80c730b8836b56be6866fd0bd88307b004d028d361027a39cccd47df2c972fb51b62aed509fb0014d4b73a35cd70f0bd407d79a7d0faf0b9eb8645aa7ca2b10c
AUX xf86-video-intel-2.17-sna-offsets.patch 1062 SHA256 26ad750c57220a11875ebf4bb1665cf748c9da12af9c0eade12609559de06041 SHA512 600593f189d5593b5452c8e81903c604718bd506e64a9f5fd30bd1ccc0a8251ef816ecca73e4d405372a73c3b0222902c576ea6dffb5be4c17e0ec73023d8371 WHIRLPOOL 0d9a4a62cb712a37de3efa31fff8c47d69feab69f673b38718f9eccc539071c7eb85cd51ad442ee14ff02fc1db25fed3dc42672c22f785b3d918ece04600d6d7
AUX xf86-video-intel-2.17-sna-pipeline-flush.patch 1634 SHA256 c9605db58f8a2849061b837807bf30bb85a021ea98de2976aefa8bb533d8106e SHA512 9c94777e659ee766e12e8d0ab03530cc8a0eea9a328514bac07bdf42a9e3bdd54e4be300da2fc090a2407601141534eba9c4eabf13b0a0b5aac7565eaf0b5aab WHIRLPOOL 7f03bb5bdf0eeaf0e0c1d434fafc2426efe813c9db96f34867ec31588280231e5e42fa805d381598a77794dd2b70239813d1a537cb7655f1e283fcc1d45709ec
+AUX xf86-video-intel-2.20.10-filter-blend-flags.patch 1311 SHA256 d11bc8f2ab207ba282ebb1b5d68820b1792fad3d892a3aefaa0dfc24d44fd590 SHA512 568e7d1103066dce6cf5646e394966c07c9f32768315fd611673525b0f0c089f1e163f526c1bce37b06525a9fccfb10abf164d2429e4a600db05b4a72934653e WHIRLPOOL a885ef9bf022c7637a1f3baeea34dd831d72d515e1d45e452df3f522b0635f475bc1753a9f795a951c74ebe2bfbccf0a7213f8118d50fa28eee14ddbf2c40d90
DIST xf86-video-intel-2.10.0.tar.bz2 885299 SHA256 e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
DIST xf86-video-intel-2.11.0.tar.bz2 871551 SHA256 db292cbc25f3b132357795697a61c5ec6f08cb041a2cb6fd081298306f4f5a4f
DIST xf86-video-intel-2.13.0.tar.bz2 917026 SHA256 d8b2fae8d0c4ae372994cb7df8de8aa995b8e89b1bc5766c53ea0751752fc887
@@ -14,6 +15,7 @@ DIST xf86-video-intel-2.18.0.tar.bz2 1424467 SHA256 dce63e33ccfada39ef1e1e6768df
DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
DIST xf86-video-intel-2.20.0.tar.bz2 1552275 SHA256 21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783 SHA512 ebd51c6031c62d5ac93b03dde712b9918778e8a58891db0747747124c4956dde19d3bf3659979d7fcc1ff08268f347a162e1ee645151ba8d0b39b5f2f4256feb WHIRLPOOL f76d89456ba833c7e3a0d136fb81af58502368803b554ba413a5029581d074cbf5a3f97c28e77dd3dbe18de0fcd2d47c4f3e01c50b51cd7de050544ae248a590
DIST xf86-video-intel-2.20.1.tar.bz2 1555032 SHA256 de340a527dfa26bba6f79b423c2fe2b1d70657e46fa3fb468613c047443ff424 SHA512 cd0b39bcc5adeb44d6768c9482a7c779c3553c6b9f966b402b1ec29e72298566078cfabfa055f6d5e3f9ef43109ae1a2567519e8151341634023e8e14b04e7a4 WHIRLPOOL 8e0695f05abd9e314eb51fe1e1fa8427977779da6c7baa8f346732b89d5ada04ad012e4818843733c360d3640fabb337899800f1cc48a43b2b1976d81fab952d
+DIST xf86-video-intel-2.20.10.tar.bz2 1643190 SHA256 df41a28c3d877f3c5e87cd7d840f51fd38dde8bc91f5f0d09510fb8e2336cdcd SHA512 2ddb0ceb8540640cbdf0817f84dcc62d86b3a335377c905993084d54563769aa6c572a97c22db3e184d45e885bfb6b7f0a388632dd2d1fcc5f41ae82c1137c6d WHIRLPOOL 40083853926a9cbb802b811746b3c1fcdaa9f6e0d50a4efd0389eab75ec44de17cf6240c992cc3ad318a4a105e8e3b2d6d0cea4d4614e05b5f0475498f6f7163
DIST xf86-video-intel-2.20.2.tar.bz2 1559622 SHA256 4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9 SHA512 bbb5bd42a31b67003ef440ce55593bc78feaf20a31bbf68b1152ad4dffbbb7f9a3581e63775024829d21260fc2d4e363fa47d9dba404e7a44bfced418eb6a940 WHIRLPOOL 40bd264ed3636be8117d7e2036bc044a4bdc074997765c851ce2097685e11cd241ff34cbf6611710e20f45210d0a5a81d61c96eaf6d33af48e44ed8104b63247
DIST xf86-video-intel-2.20.3.tar.bz2 1607972 SHA256 effca1382e595cc071b109818150db229ffb54f92769e4758398abbe69acb92c SHA512 1924303f96d4f05a552d89077d09b6b363d28ad21cd6a47049758782545489f8e737f139e9f116debcd340fc8c571ecf0b85dc394fb5a348ce4a35ac8b2384d1 WHIRLPOOL e076980bae869720bb64ba842898736e7b75eb2a9ddb1e87693c2c2c8fa139cc3aed6b664eeed1a18b135518d0c04f8ff3dd6c5e05ae0b65d40e60dd2008dfcd
DIST xf86-video-intel-2.20.5.tar.bz2 1621295 SHA256 143d1cd808694ca7202b642fbb2b03a43a7474d7b527216c517fc41319410bec SHA512 fcad519568ee10c1bd62f882593a62ad3b90a1959daeb71cab404ea8d87bb63c8b09dec7bb71d3013e39d6338b44c8dbc146698549fbd17197cb1901cf7bab1c WHIRLPOOL 1fcbc7cbb934b3f0e306e8717614a9a2eff289322b8c6ff0176206ad0047834ddbdd405cc6106c89d6ad896ec8bc353137d5963903297145beddf236c86f740f
@@ -34,6 +36,7 @@ EBUILD xf86-video-intel-2.18.0.ebuild 1299 SHA256 e7ac5cebb467afa74615baea43d069
EBUILD xf86-video-intel-2.19.0.ebuild 1370 SHA256 54857f8823ee2d4a3d943e51dd0913714607b93480213d14ddd02b0bc47ca23c SHA512 3158705db8a31d7d62621bbff736134db78d5b7a534aa7e0819c8137eaa89ebb12a161098f7c13b61377861bc74cdce40990eb9a729e3e00d43f7683927599ca WHIRLPOOL 4cf754091d5e22304b52bbd323144290ca022fbe33a7ec7ae2502b591e4bae206a93dcb02a511434f0fc1f9df6d1ce287d9844cf521aedb505dfc375371f9887
EBUILD xf86-video-intel-2.20.0.ebuild 1355 SHA256 86de75abcee78e65d7b23b0f488bfc1b54189dde2f119b02384f267230bba4b8 SHA512 df34ba12f5b258bfb388497c9b00d2ce19fa1c3692d0454f8a011b6aa578497c02abc9cd14c8748adfecafcf54e6aac2984be70242289643d0699ce39e4adfc5 WHIRLPOOL 4424ed586149621ac3e7c732f0e0df968ccef6ee71a4f01ffba51b0859fcdbd6ea200ce33b872fcd9423871f1a72f0094cb26b80b21e29b4af347dfdf172c8d8
EBUILD xf86-video-intel-2.20.1.ebuild 1355 SHA256 59cbc2b2d146b78624ce631f79e59297b7df3ed29317d513b678538dc44fe8fb SHA512 440a90ff4cd7e90ffda0c880036b4afc36a70b13d1b2cbe65be21b7908ef7776d0ca8cef5b4f27c6d5dc92dbd340891354f981204cca257b118992cbf83107a5 WHIRLPOOL ec4c73715469a42a25a02d628b98f528929b86bbe8cda48fb58d65675ed53e564be8f26db1049a6376dcb8117c6653235ff6c794074fdf258cc4b13d208f5dfe
+EBUILD xf86-video-intel-2.20.10.ebuild 1580 SHA256 a1afa131583636b5c89ed8957c2ff0f15e8a46dc10a4c189e31d0d28e2ab7f62 SHA512 ab9916a7f87c7d7c8749b7ca4a6eb360d4def6025cdaaf4623a37e4146e01d9d99463877f7531337e8102e5324fe7716ec030eaeec4acc9dd4f420846f4ec8e5 WHIRLPOOL b4c2016e5e26a2080230f90f2300fde1b021945bdb712454bd336b3114fb53507f1af69052bf205396e682b8bc5ba62449387b4decb4b1c2a8bbb7fa355ba0c9
EBUILD xf86-video-intel-2.20.2.ebuild 1355 SHA256 f7e654a851f88ce3e7d8b5a1df697dfa8199ac40a2c607491cfd1e9ed37a3715 SHA512 fdeea7caa4ade6bdd0d0972d8a34f8cdf6c983b9e8f4175b424d2fd3d445b96145bca6a947144a086aaf86badce70b3910f19393d5a501865d0e10943b2ba284 WHIRLPOOL bc17c8377a39003aca7f70a7498d8c828743a32348c2e6964b98d6b1ef70fe15044badc0ceb03cd0e4509a396a0cf424ae3ca18ce6dbfc86cef6ca568e130542
EBUILD xf86-video-intel-2.20.3.ebuild 1355 SHA256 9a5b47dde9dc1d8d1b81c55230d1b764407f919e515aae94ad723abfeb27dd62 SHA512 b67d0c3146535d11a6c3274704eaa890c7ad22448626e41435424973db3d016b7853d264f998eac033a46bbb87ea25dae2b12821746b35180d842e0db9166db3 WHIRLPOOL fada91129f3cd2ddc87563b694a0d0adc301419d770559a7078e910fa9fbf1c8e1cdf9be544ca1495bbffb358a713dcb0f9eaf1825cd35910a2b006f0aa197e2
EBUILD xf86-video-intel-2.20.5.ebuild 1355 SHA256 46bb876a6a94b2a49f3310a2f821ab22f177be5b4bfc8157e85ec50e717a8c41 SHA512 dfe6be20b8335ca2a4b9e6548e640070625943eb2d831dad16a087bba71f6814849c4686dada97060fded46c326f6a8d85d68a75049ee92fea1bd311c5f08878 WHIRLPOOL 40396f8213764fb73d57af3edb1ba4055337ff10e1afe0c69c9e8a014bbfeaabf2bb7d0e0cdf0e9aeadcc156a0d3a75640041d53c5c68619ea0570e9366e4144
@@ -43,5 +46,5 @@ EBUILD xf86-video-intel-2.20.8.ebuild 1517 SHA256 143a8c1fe3df39bed3c8ba45405a07
EBUILD xf86-video-intel-2.20.9.ebuild 1521 SHA256 c56899a19c8699d6968763fd82df2d5489e44aacb6243cc86ae80a0403e36325 SHA512 6d15b631e32c806c58ac46136c96b0905ed38be99b39574b726e2be1a0c2299cb07fd451593db6ed360b8615d66be889533a6218031f1783a51c1fba1891e204 WHIRLPOOL 14daf087f7beb4ad452f3422310241cba285c9634a2a9bd710c1ad29caee2074efdab4222a13646ef71c479df89b0c5cb6acb2bd723357d3bf1d24866157c02b
EBUILD xf86-video-intel-2.8.1.ebuild 794 SHA256 d012b3c43258b9e5e06d56e1d4aec2711644443eb927e800f9525bdc9610bf2f SHA512 e3791c7e80bb544618893401fc9dd157e5ce6d18727630ca7dec24ef8687bbfdfa2954fb70eebe31b0179c79e94861b6d4f2dedfd774017a1b492bad5944c36f WHIRLPOOL 93c4340495ec0b6fe6862a7e91bc8c748f96148e89980041bb0bf77e9982165af23f2e40b396fa0c4ebe9966b2d228182fd87403744c2f86cd0cfea229c3ac49
EBUILD xf86-video-intel-2.9.1.ebuild 776 SHA256 7093496b4a55550f1f2a11b0f405be716f5da354947ff7380a052e4fd6954129 SHA512 29baaa622d1f6f3a8109174fe93569a5c1f25a862b81d6b72ca26e8ec8afdec3a072fce500a1bf30a11048650dc1eac1acef1dbae8e7e3506918e97ce0fda774 WHIRLPOOL 5377d90052588bebdae21154d4ff34703e9f5c468a76cf0fae92901e65895cc395d133f225ff777c5dbd250c995b11e60c4a6e8faafc1f65e1d81f86efffab41
-MISC ChangeLog 48753 SHA256 77e0843925c60c19f54794946ef60b6fd99782e1a10a57a10b854ccba7ceafd5 SHA512 6010a73818b7bd7950e5f8b98464963b2a622d8dcd64f36dd3a677614425cb10ca1a6411bd038fb67fb6a67b6b0acfa1451c252fdfbe5f753c984a7ca057b383 WHIRLPOOL 08e5d44fd50dc70e3a0b9e4cfbbda7821f0a13a2e549bcad4674da2caf4546196437ad0ea9e34b5da6fd5d7ea48aabc36aa709fefe4f9cd8a87c159f17c15f5d
+MISC ChangeLog 48976 SHA256 d4e718f966fc9d1fe916fa5cfc2d23ff8678ca970bed0cbc3036d1b43804076e SHA512 a45821b926643cdd3a16ec5797c8cc6250629fa90966227ddf60ec14abfca95409ef5c6ad2a4cd9e975cbb8fddf646df2664603dd00352ef1a13113137669c40 WHIRLPOOL 7770c2caed70b7c466663a9e2c1d5d54e3ef4d6bae176b8b6ca18e6679764660630aea9064e6039be07e569d348374b26536d770b51a331df0f6e62258d205fd
MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.10-filter-blend-flags.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.10-filter-blend-flags.patch
new file mode 100644
index 000000000000..08c37f603191
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.10-filter-blend-flags.patch
@@ -0,0 +1,36 @@
+From 7927f9a351ead1a5593bc91e465706bdd889bb8d Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue, 16 Oct 2012 16:56:30 +0000
+Subject: sna/gen7: Filter BLEND flags for CA glyphs
+
+Fixes regression from commit c51aaa731e5cffc892e59730194ad7c98789b02b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Oct 11 11:36:00 2012 +0100
+
+ sna/gen7: Replace bogus state tracking assertion
+
+The assumption being that we only used the encoded flags for determining
+the composite state is false for the magic CA pass.
+
+Reported-by: Oleksij Rempel <bug-track@fisher-privat.net>
+Reported-by: Eyal Lotem <eyal.lotem@gmail.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56037
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
+index 4d94c80..c3639f6 100644
+--- a/src/sna/gen7_render.c
++++ b/src/sna/gen7_render.c
+@@ -1077,7 +1077,9 @@ static void gen7_magic_ca_pass(struct sna *sna,
+
+ gen7_emit_pipe_invalidate(sna);
+
+- gen7_emit_cc(sna, gen7_get_blend(PictOpAdd, true, op->dst.format));
++ gen7_emit_cc(sna,
++ GEN7_BLEND(gen7_get_blend(PictOpAdd, true,
++ op->dst.format)));
+ gen7_emit_wm(sna,
+ gen7_choose_composite_kernel(PictOpAdd,
+ true, true,
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.10.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.10.ebuild
new file mode 100644
index 000000000000..8d319eb9284c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 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.20.10.ebuild,v 1.1 2012/10/16 22:31:03 chithanh Exp $
+
+EAPI=4
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~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? (
+ sys-fs/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}-filter-blend-flags.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
+}