Version bump, bug #523682.

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

5 files changed, 68 insertions, 30 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/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
+}