[gentoo-commits] proj/x11:master commit in: x11-drivers/xf86-video-intel/

["Matt Turner" <mattst88@gentoo.org>]

commit:     dc9008286980c3fd10e4197701d51e8438e52f63
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Apr  5 19:22:52 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 19:23:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=dc900828

x11-drivers/xf86-video-intel: Remove glamor USE flag.

Glamor is now part of the xserver.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=545338

 x11-drivers/xf86-video-intel/metadata.xml                 | 1 -
 x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/x11-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml
index fd32271..5083c20 100644
--- a/x11-drivers/xf86-video-intel/metadata.xml
+++ b/x11-drivers/xf86-video-intel/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>x11</herd>
 	<use>
-		<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 		<flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag>
 		<flag name="uxa">Enable UMA Acceleration Architecture</flag>
 		<flag name="xvmc">Enables X-Video Motion Compensation support</flag>

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index 85827ad..570412d 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -10,21 +10,16 @@ inherit linux-info xorg-2
 DESCRIPTION="X.Org driver for Intel cards"
 
 KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug glamor +sna +udev uxa xvmc"
+IUSE="debug +sna +udev uxa xvmc"
 
 REQUIRED_USE="
 	|| ( sna uxa )
-	glamor? ( 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-base/xorg-server[glamor]
-		>=x11-libs/glamor-0.6.0
-	) )
 	sna? (
 		>=x11-base/xorg-server-1.10
 	)
@@ -47,7 +42,6 @@ src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable debug)
 		$(use_enable dri)
-		$(use_enable glamor)
 		$(use_enable sna)
 		$(use_enable uxa)
 		$(use_enable udev)