Version bump, bug #523682.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

6 files changed, 89 insertions, 49 deletions

diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index ca7c6f884db0..d2dfd40f1568 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-nouveau
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.74 2014/08/06 05:28:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.75 2014/10/23 15:01:49 chithanh Exp $
+
+*xf86-video-nouveau-1.0.11 (23 Oct 2014)
+
+  23 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-nouveau-1.0.11-glamor-automagic.patch,
+  +xf86-video-nouveau-1.0.11.ebuild,
+  -files/xf86-video-nouveau-1.0.9-immintrin-include.patch,
+  -xf86-video-nouveau-1.0.9.ebuild, metadata.xml:
+  Version bump, bug #523682.
 
 *xf86-video-nouveau-1.0.10-r1 (06 Aug 2014)
 
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 0ee985fa3ebb..e2002171869f 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xf86-video-nouveau-1.0.9-immintrin-include.patch 569 SHA256 50221bbfaf7cb105af023e127c62796e0ca2e33ba64500e148a40133c53fe79f SHA512 262aefc0df81b0df691825b78a5742cf666bc75a62a9f3ad20e82d499f686876e9fee7a4010c245acffc3e775363efd597d734b21650234ca90a49507412aa74 WHIRLPOOL 5c128a2546e01ca2bb176c1ee94ff2ec07602f6d263f06fe30f9b7a1e613ecaafc748c8dfe04aa3bb24e2625df9e78a919e1046ae3445122f5eaccbc0248e04d
+AUX xf86-video-nouveau-1.0.11-glamor-automagic.patch 1375 SHA256 c5f8a0740905db0d244981012ce4eae66e05febecf097dcfb3658145e8dbf1ab SHA512 8c50d4327d80d64ce6affe911af718c9d1b3aca636af6f04ce787666a037d60053e6dbc8b66462c43d32049eec03dad64099b6d4bd59e2bb126ab47048b78374 WHIRLPOOL d04b7e9299f162ebb3ce57622656af6042f82ba2f62f595f07d1ba046b1446c2bde6387edc0572f2d4e0fda6f8001a5b35e1f1ce9f67a964451e7bcb6e9e9551
 DIST xf86-video-nouveau-1.0.10.tar.bz2 580544 SHA256 c1bab3160bae96d485fc93a048d19775398aa85b407bac53020675f7e995db9d SHA512 461301e5e05cdf21197abe7d7c009d491aa7d455403a3976d0ad0cba05a8d43010440e60061f5d3bcfe6cfe6bd6c4c7723ed73a889459950b795ea895459b32b WHIRLPOOL 1600767973034ab914b8978f134afbee6d33220c8a798328fad5815a84c25aa6a47192289ecf0d949272251f2574627728594b6633900a9f21b40fa5dfba245c
-DIST xf86-video-nouveau-1.0.9.tar.bz2 580019 SHA256 b247c800e532fad1c80a5666d8ca0d4e5712064b6d7a3b030b32206a8de04482 SHA512 61118a57c3918b516d250fdba917cc32d85576aa46fe84b4632e6cb1cd0e00dba76cd36667d66821361d75ddd6cc1c91a7f4d13ce0bce79e1ff2f19297474de1 WHIRLPOOL 773ed56730ad0210bffc55561177aeac0fae3973e2e8561e0e0ea3778d5e0c9876e55188422b4963ae9c25a46635a1b656c686c9b6fd98848b7895889605799e
+DIST xf86-video-nouveau-1.0.11.tar.bz2 582436 SHA256 f84fe2b2787f3ea9419eac3aa86462b929a551b3dbc4de550cc83b67f3216848 SHA512 4ceffc711798b98a5ee67d9df33d1a4f1d2b7d100605ea04b2e689debf745bc5a4f8907b602d1689ec6ed6400b2fc0ffe0eb0f7e7787bd2dd3cd5db1d14e90ee WHIRLPOOL fd201e7387cde4767c84c7be00cf3cff11fe542d079993369264b4fab090885050df51151aeef73153642666902437ad0876bc9544f6beb35ac5bfb6e19e9c97
 EBUILD xf86-video-nouveau-1.0.10-r1.ebuild 862 SHA256 3b864363269f20ebc9e4eac68167fec5a8a2fa6e7a5dc37931ff07da31780dcc SHA512 98415ef70f7dcc2d2a34445bba002c56aaa797f4dcefbc74fc0e6211f6de99aee14852edd863284f2516e0f605ddb51dbb34e660dc582d43e5270a1b3524116f WHIRLPOOL 6f032069db546cba53380f326a6912560c4ffa101d62ea45b6ada9e916fdf513397546febef5f40dda9893d90f9494f67b691c2133c9169f674cd4432207fc1c
 EBUILD xf86-video-nouveau-1.0.10.ebuild 617 SHA256 675b3bd2a69c87771887c585217ca8a8f6e24a9a8ec711f2a88869ba5b964455 SHA512 435c8bd2b8330cd2212f21862279496d5de9365a91a594eafee3855c9250ccab6ee8e40ac410e630e72e727b89ee32e367b4dbe6d38640d06ce4af0e8591cfcc WHIRLPOOL b6f97042ad16b1984ed1becf02162ec5d8313e57ccae658c7bb8dbb973a14eb6486284c9b9f5ff4eb78a9183576d87627d1cc085857dbde4f953e95d67b02f13
-EBUILD xf86-video-nouveau-1.0.9.ebuild 673 SHA256 ee6c61f5f669977964d070f126b432ed9abca2a0b2f69c1dad0f7938067d8001 SHA512 414358deb5c635c58898523aac8a7cbfbb83b518b25aab05cee128cd9d508e44980da1928ea82ab0534efd99b995396470f56d3f20e91a2c4456cacf6fc196d5 WHIRLPOOL 41cad78eabf0a66226a8f5b1f36786ea2644ebe2f0ea471dec87d349c669149f992857c2780e2d404d5076610ef47aecf451c37194b73997d5bf7dc0a36afe5b
-MISC ChangeLog 13589 SHA256 6f6496aa8176ac6fe7c69d772126bc9e8d0b6b91b92a2951c0b60bbfb3a014ef SHA512 d0553fcb7a890e29d9443c1c45b8f8f2f716367e050ef3f69dcc0a2ed87d86168ccfb89163eb7b01b4b70a7143ad453152778334e9740aa99117c1f1e7d99bf2 WHIRLPOOL 2c8d65fe411093780e1849b74f478639066ecf910a7eb516d596d06e290b1b1c39da51e297d6386e71a7fc53d4775583603e0cb53da6f7682e261e46eb9c20db
-MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
+EBUILD xf86-video-nouveau-1.0.11.ebuild 830 SHA256 993272df9c8bcf55de47b88304a15eabc1135a4d658633babe2b5e12199d419a SHA512 b26331329dc211f3dad18d08ab1d215b4bb928bd11eb7311cb3bcb95cc0669cf8986c3fae691d312ec5fac26b8c8e49789e2b455721a4e818ee717525f9e4286 WHIRLPOOL ea78b6e1f7f5ca97bcd38452efb708ce34b711325f9602b1a330979cce6b3b5aa8c12533532dc8bc14de4f0b18ec1d6af79769a4091190e3b20d82b98b8a77b5
+MISC ChangeLog 13937 SHA256 d3d360535d8f5bab05c4cc25a7c0fa653d5ef33dcc3c33d07902a5dbaa9555b1 SHA512 06d815fe714f90d0d1e1b3b984ce8f9dbe7e8a79f2844da67f9f6edd68b95f8fd3087049c71dad6ee9eb8e938e450bdf6f02d128dbafbada383ca807d8bf5567 WHIRLPOOL 36e019bc2d132ffb01ed6a18bb75a5fe744c6588063fb859be35f51098edad847b6b82ed4be298bb4433e96f8269df6716caca33b7a99f9112fd6b742238cca5
+MISC metadata.xml 234 SHA256 c576bf25080db3484d07d654f7154894c03e15ba75c1e0a2461e4b3cee64ea3e SHA512 68aca8ec7b1603cc347d814cacf1415dd0eb3211b28e3325a8218c27a47ebe0e8dcb1d336db6054005da5fd9a85c4c3a7b67fababdb2f0a311e4b6b9e82caec7 WHIRLPOOL a72d888c968b4f22f8b37fe083b70ec18bce0942543fe6d1644ed27080ec882122972c78271689f2096ce6615c9a21ee3e4758da8288be6813da0b1efc07d335
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT4b0eAAoJEPGu1DbS6WIArIYP/irUqLUzGAYpgQ582ZIvjNM1
-KEzas+pWvv1KLYcD3zxr2UM7I3tmXpQGG75c4pDzEzJATBTDfEEUzkClsMY1nNJ3
-JrhlKaaTHu3DADxcjHNV8l6QzNgSTk64RLVvoWHv57VzXcXTDfbR0QblLKKqLxZX
-v5X2ZR7+G8WVVc3K4t6QmWnDmMCj7RJNgXFXEQdG96IvWYj5YVcUPIF1moGeuNxi
-hofy8lwpFCtq0T6JhJVK5zGw7hlAZevXm75viStUxCveuG3ftVsnLetuNH2Hw6Sf
-IWEY8NcEj9wx+6rXxR53uIKVPo8NLalUjZ0DQ6drPrWlbP3F2la4WRq1RMzzH8D5
-DvUYadWxoSiK8xDw6KWYLfyk48uPA1dBv9903FDMngZtckgXqkOJ9lZTH19cmHJr
-ntXlHDBAgxcN1xv3Tus6WulDgAJgSJEugQanBaPRenCmLp0T/AGZhia9LvY9+hvb
-Zn0OeonrkzgEuaWO3UFrrZ5LIteM9Xt5a2tRE14pMMi5yO/HvQxQ0KuiXbPFFV3q
-sYPgkIZRJWUXpN4ikzKCb5uiVA7J1EPDcJYxn2QmSM69+Onx0oZRtIfVYMKZOLAD
-S8ND1OQlBe7rhEFG1kHohnfMcjR2RUSU69Oa8qlw20UkNbOoBa1F5nwwsUeKmobv
-SoFtz/QpKdkKHgLWMW4k
-=joy+
+iQJ8BAEBCABmBQJUSRhhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR/pcQAIKzACdCocFq4ycvtNefNER1
+mhYmes0DdViVGqKwzB9FrqPUumnbQSJzo6CnbYK8jvFDeWw4nDt1bLjWAtfKK5sz
+DwLwjFOT+1x0xx99uFOvNZyEDsgG3JhOa2IEY/sFdYMbsEOOtNZs8iF4AQKQvX7a
+6oh8V0LO1qzz+Dv+ZWc9URYRAY1n+xQj1h3Bi0hFcE2H5/HDGtuNFyOYjox64Nhs
+WDVjgTdALeDK2jPgO7rE94Nd/iTkxvsRw4uhqt3oeTpf0+oiyXEqt5+md9SiNltP
+ekLczsqE5b+oI4j8rzu9urz2ttDjl+C0cBTHH1/3HU6Vi5Tp4IkzGrm3Ui6pd1hw
+s2w/Vm2gLPPm1UHnE+JLZXsTiJC04zHxHWti2OskK9m4OnLGbwprWgLrk5diE2lT
+VgN4tfQi4bRjHJ1Pp9NYhfQ06goS45Ut2HCGtVKG5FXeBvCWk1qnAuWW208n3W/y
+S3TSu6+uET0QdenJyWOwePsMXGuvzKRGSB/EzArHW/k7S+ks/TVCAxtQ540oq63i
+tRQ3hpKUD/Cd2HC4FMXhKWzg2EkyRoOENKLtm5HSnY83cYMI3fZp894LfCkB2uJA
+K+6VTzwBvhl4h+4Q5WzVz5F+Tfr976K4NS8rBM0ILAyNSwBcpYxNe48YzveT1fWz
+VCnu8sQrYcka36gwziTj
+=k4Zc
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.11-glamor-automagic.patch b/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.11-glamor-automagic.patch
new file mode 100644
index 000000000000..310070f99eb7
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.11-glamor-automagic.patch
@@ -0,0 +1,42 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2014-09-03 21:29:04.000000000 +0200
++++ b/configure.ac	2014-10-23 16:31:21.117695404 +0200
+@@ -140,17 +140,29 @@
+                    #include "list.h"])
+ fi
+ 
+-AC_CHECK_HEADERS([glamor.h],[found_glamor_header=yes],[found_glamor_header=no],
+-		 [#include "xorg-server.h"])
+-AC_MSG_CHECKING([whether to include GLAMOR support])
+-if test "x$found_glamor_header" = xyes && pkg-config --exists "xorg-server >= 1.15.99.901"
+-then
+-	AC_DEFINE(HAVE_GLAMOR, 1, [Build support for glamor acceleration])
+-	AC_MSG_RESULT([yes])
+-else
+-	AC_MSG_RESULT([no])
++AC_ARG_ENABLE(glamor,
++		AS_HELP_STRING([--enable-glamor],
++				[Enable glamor, a new GL-based acceleration [default=auto]]),
++		[GLAMOR="$enableval"],
++		[GLAMOR=auto])
++
++if test "x$GLAMOR" != "xno"; then
++	AC_CHECK_HEADERS([glamor.h],[found_glamor_header=yes],[found_glamor_header=no],
++			 [#include "xorg-server.h"])
++	AC_MSG_CHECKING([whether to include GLAMOR support])
++	if test "x$found_glamor_header" = xyes && pkg-config --exists "xorg-server >= 1.15.99.901"
++	then
++		AC_DEFINE(HAVE_GLAMOR, 1, [Build support for glamor acceleration])
++		AC_MSG_RESULT([yes])
++	else
++		AC_MSG_RESULT([no])
++		if test "x$GLAMOR" != "xauto"; then
++			AC_MSG_ERROR([failed to find required Xorg headers for glamor])
++		fi
++	fi
+ fi
+ 
++
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	src/Makefile
diff --git a/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.9-immintrin-include.patch b/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.9-immintrin-include.patch
deleted file mode 100644
index e01c3e4086c9..000000000000
--- a/x11-drivers/xf86-video-nouveau/files/xf86-video-nouveau-1.0.9-immintrin-include.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1df177f35a05db505577cdc929e63fde906a704b Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Wed, 31 Jul 2013 00:51:03 +0000
-Subject: nouveau: fix build on ppc by wrapping immintrin include.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
-index 5569b7c..e19378d 100644
---- a/src/nouveau_xv.c
-+++ b/src/nouveau_xv.c
-@@ -25,7 +25,9 @@
- #include "config.h"
- #endif
- 
-+#ifdef __SSE2__
- #include <immintrin.h>
-+#endif
- 
- #include "xf86xv.h"
- #include <X11/extensions/Xv.h>
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-nouveau/metadata.xml b/x11-drivers/xf86-video-nouveau/metadata.xml
index 01c4c004e735..b19c4dca8ea3 100644
--- a/x11-drivers/xf86-video-nouveau/metadata.xml
+++ b/x11-drivers/xf86-video-nouveau/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>x11</herd>
+<use>
+	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.9.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
index 8fc579853b2c..922387157692 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.9.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.9.ebuild,v 1.6 2013/10/08 05:06:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild,v 1.1 2014/10/23 15:01:49 chithanh Exp $
 
 EAPI=5
 XORG_DRI="always"
+XORG_EAUTORECONF=yes
 inherit xorg-2
 
 if [[ ${PV} == 9999* ]]; then
@@ -14,12 +15,18 @@ fi
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="http://nouveau.freedesktop.org/"
 
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="glamor"
 
-RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
+RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]
+	x11-base/xorg-server[glamor?]"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-immintrin-include.patch"
+	"${FILESDIR}"/${P}-glamor-automagic.patch
 )
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS="$(use_enable glamor)"
+	xorg-2_src_configure
+}