summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaik Freudenberg <hhfeuer@gmx.de>2019-09-18 12:53:03 -0700
committerMatt Turner <mattst88@gentoo.org>2019-09-18 13:05:02 -0700
commit596dff7bf9f1ffb504daba2d87076d62feb90908 (patch)
tree95559ccc85c3a0ba876cf7ac32d204563db9b4a2 /x11-base/xorg-server/xorg-server-9999.ebuild
parentprofiles: Move libglvnd mask to use.mask (diff)
downloadgentoo-596dff7bf9f1ffb504daba2d87076d62feb90908.tar.gz
gentoo-596dff7bf9f1ffb504daba2d87076d62feb90908.tar.bz2
gentoo-596dff7bf9f1ffb504daba2d87076d62feb90908.zip
x11-base/xorg-server: Add libglvnd support
Closes: https://bugs.gentoo.org/692168 Signed-off-by: Maik Freudenberg <hhfeuer@gmx.de> Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-base/xorg-server/xorg-server-9999.ebuild')
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild12
1 files changed, 9 insertions, 3 deletions
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 3547a7b0742..c45093888f5 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -14,9 +14,13 @@ if [[ ${PV} != 9999* ]]; then
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+CDEPEND="libglvnd? (
+ media-libs/libglvnd
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
>=x11-apps/iceauth-1.0.2
@@ -201,7 +205,9 @@ src_install() {
pkg_postinst() {
if ! use minimal; then
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set xorg-x11 --use-old
+ if ! use libglvnd; then
+ eselect opengl set xorg-x11 --use-old
+ fi
fi
}