1 |
commit: 596dff7bf9f1ffb504daba2d87076d62feb90908 |
2 |
Author: Maik Freudenberg <hhfeuer <AT> gmx <DOT> de> |
3 |
AuthorDate: Wed Sep 18 19:53:03 2019 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 18 20:05:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596dff7b |
7 |
|
8 |
x11-base/xorg-server: Add libglvnd support |
9 |
|
10 |
Closes: https://bugs.gentoo.org/692168 |
11 |
Signed-off-by: Maik Freudenberg <hhfeuer <AT> gmx.de> |
12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
13 |
|
14 |
x11-base/xorg-server/xorg-server-1.20.5.ebuild | 12 +++++++++--- |
15 |
x11-base/xorg-server/xorg-server-9999.ebuild | 12 +++++++++--- |
16 |
2 files changed, 18 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
19 |
index 1fbae4ec655..d6883094f9f 100644 |
20 |
--- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
21 |
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
22 |
@@ -15,9 +15,13 @@ if [[ ${PV} != 9999* ]]; then |
23 |
fi |
24 |
|
25 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
26 |
-IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" |
27 |
+IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
28 |
|
29 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
30 |
+CDEPEND="libglvnd? ( |
31 |
+ media-libs/libglvnd |
32 |
+ !app-eselect/eselect-opengl |
33 |
+ ) |
34 |
+ !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) |
35 |
!libressl? ( dev-libs/openssl:0= ) |
36 |
libressl? ( dev-libs/libressl:0= ) |
37 |
>=x11-apps/iceauth-1.0.2 |
38 |
@@ -206,7 +210,9 @@ src_install() { |
39 |
pkg_postinst() { |
40 |
if ! use minimal; then |
41 |
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
42 |
- eselect opengl set xorg-x11 --use-old |
43 |
+ if ! use libglvnd; then |
44 |
+ eselect opengl set xorg-x11 --use-old |
45 |
+ fi |
46 |
fi |
47 |
} |
48 |
|
49 |
|
50 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
51 |
index 3547a7b0742..c45093888f5 100644 |
52 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
53 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
54 |
@@ -14,9 +14,13 @@ if [[ ${PV} != 9999* ]]; then |
55 |
fi |
56 |
|
57 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
58 |
-IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" |
59 |
+IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
60 |
|
61 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
62 |
+CDEPEND="libglvnd? ( |
63 |
+ media-libs/libglvnd |
64 |
+ !app-eselect/eselect-opengl |
65 |
+ ) |
66 |
+ !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) |
67 |
!libressl? ( dev-libs/openssl:0= ) |
68 |
libressl? ( dev-libs/libressl:0= ) |
69 |
>=x11-apps/iceauth-1.0.2 |
70 |
@@ -201,7 +205,9 @@ src_install() { |
71 |
pkg_postinst() { |
72 |
if ! use minimal; then |
73 |
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
74 |
- eselect opengl set xorg-x11 --use-old |
75 |
+ if ! use libglvnd; then |
76 |
+ eselect opengl set xorg-x11 --use-old |
77 |
+ fi |
78 |
fi |
79 |
} |