summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-base/xorg-server/ChangeLog9
-rw-r--r--x11-base/xorg-server/metadata.xml1
-rw-r--r--x11-base/xorg-server/xorg-server-1.15.99.903.ebuild (renamed from x11-base/xorg-server/xorg-server-1.15.99.902-r2.ebuild)12
3 files changed, 18 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 9a58f7293ed4..c32c5983aed1 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.794 2014/05/30 14:29:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.795 2014/06/05 13:35:58 chithanh Exp $
+
+*xorg-server-1.15.99.903 (05 Jun 2014)
+
+ 05 Jun 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +xorg-server-1.15.99.903.ebuild, -xorg-server-1.15.99.902-r2.ebuild,
+ metadata.xml:
+ Bump to latest prerelease.
*xorg-server-1.15.99.902-r2 (30 May 2014)
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index c5056f1c920a..cbff1d2488c4 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -4,6 +4,7 @@
<herd>x11</herd>
<use>
<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
+ <flag name='glamor'>Enable Glamor OpenGL 2D acceleration</flag>
<flag name='kdrive'>Build the kdrive X servers</flag>
<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
<flag name='unwind'>Enable libunwind usage for backtraces</flag>
diff --git a/x11-base/xorg-server/xorg-server-1.15.99.902-r2.ebuild b/x11-base/xorg-server/xorg-server-1.15.99.903.ebuild
index c86533f3e8f4..adfa16a89156 100644
--- a/x11-base/xorg-server/xorg-server-1.15.99.902-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.99.903.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.99.902-r2.ebuild,v 1.1 2014/05/30 14:29:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.99.903.ebuild,v 1.1 2014/06/05 13:35:58 chithanh Exp $
EAPI=5
@@ -13,7 +13,7 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
RDEPEND=">=app-admin/eselect-opengl-1.0.8
dev-libs/openssl
@@ -46,6 +46,11 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
>=x11-libs/libXres-1.0.3
>=x11-libs/libXtst-1.0.99.2
)
+ glamor? (
+ media-libs/libepoxy
+ media-libs/mesa[egl,gbm]
+ !x11-libs/glamor
+ )
kdrive? (
>=x11-libs/libXext-1.0.5
x11-libs/libXv
@@ -59,7 +64,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
udev? ( >=virtual/udev-150 )
unwind? ( sys-libs/libunwind )
wayland? (
- dev-libs/wayland
+ >=dev-libs/wayland-1.3.0
media-libs/libepoxy
)
>=x11-apps/xinit-1.3
@@ -142,6 +147,7 @@ src_configure() {
XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
$(use_enable dmx)
+ $(use_enable glamor)
$(use_enable kdrive)
$(use_enable kdrive kdrive-kbd)
$(use_enable kdrive kdrive-mouse)