| 1 |
commit: dba654a63339bddce214386c83330c39e443fd06 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 3 21:55:57 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 3 22:12:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba654a6 |
| 7 |
|
| 8 |
x11-base/xorg-server: Enable glamor with USE=-minimal |
| 9 |
|
| 10 |
It only adds a dependency on media-libs/libepoxy which is small and used |
| 11 |
by many other packages. glamor can be disabled at runtime with Option |
| 12 |
"AccelMethod" in xorg.conf. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/698114 |
| 15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 16 |
|
| 17 |
x11-base/xorg-server/metadata.xml | 1 - |
| 18 |
x11-base/xorg-server/xorg-server-1.20.5.ebuild | 17 +++++++---------- |
| 19 |
x11-base/xorg-server/xorg-server-9999.ebuild | 18 ++++++++---------- |
| 20 |
3 files changed, 15 insertions(+), 21 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml |
| 23 |
index b3f0d6f2cde..2e8d8799f90 100644 |
| 24 |
--- a/x11-base/xorg-server/metadata.xml |
| 25 |
+++ b/x11-base/xorg-server/metadata.xml |
| 26 |
@@ -8,7 +8,6 @@ |
| 27 |
<use> |
| 28 |
<flag name="dmx">Build the Distributed Multiheaded X server</flag> |
| 29 |
<flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag> |
| 30 |
- <flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> |
| 31 |
<flag name="kdrive">Build the kdrive X servers</flag> |
| 32 |
<flag name="libglvnd">Use libglvnd for dispatch.</flag> |
| 33 |
<flag name="unwind">Enable libunwind usage for backtraces</flag> |
| 34 |
|
| 35 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
| 36 |
index 601e6ae7a36..8f859c2eaf5 100644 |
| 37 |
--- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
| 38 |
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
| 39 |
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then |
| 40 |
fi |
| 41 |
|
| 42 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 43 |
-IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
| 44 |
+IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
| 45 |
|
| 46 |
CDEPEND="libglvnd? ( |
| 47 |
media-libs/libglvnd |
| 48 |
@@ -52,11 +52,6 @@ CDEPEND="libglvnd? ( |
| 49 |
>=x11-libs/libXres-1.0.3 |
| 50 |
>=x11-libs/libXtst-1.0.99.2 |
| 51 |
) |
| 52 |
- glamor? ( |
| 53 |
- media-libs/libepoxy[X,egl(+)] |
| 54 |
- >=media-libs/mesa-18[egl,gbm] |
| 55 |
- !x11-libs/glamor |
| 56 |
- ) |
| 57 |
kdrive? ( |
| 58 |
>=x11-libs/libXext-1.0.5 |
| 59 |
x11-libs/libXv |
| 60 |
@@ -72,7 +67,8 @@ CDEPEND="libglvnd? ( |
| 61 |
!minimal? ( |
| 62 |
>=x11-libs/libX11-1.1.5 |
| 63 |
>=x11-libs/libXext-1.0.5 |
| 64 |
- >=media-libs/mesa-18[X(+)] |
| 65 |
+ >=media-libs/mesa-18[X(+),egl,gbm] |
| 66 |
+ media-libs/libepoxy[X,egl(+)] |
| 67 |
) |
| 68 |
udev? ( virtual/libudev:= ) |
| 69 |
unwind? ( sys-libs/libunwind ) |
| 70 |
@@ -119,7 +115,7 @@ REQUIRED_USE="!minimal? ( |
| 71 |
) |
| 72 |
elogind? ( udev ) |
| 73 |
?? ( elogind systemd ) |
| 74 |
- minimal? ( !glamor !wayland ) |
| 75 |
+ minimal? ( !wayland ) |
| 76 |
xephyr? ( kdrive )" |
| 77 |
|
| 78 |
UPSTREAMED_PATCHES=( |
| 79 |
@@ -136,9 +132,10 @@ PATCHES=( |
| 80 |
) |
| 81 |
|
| 82 |
pkg_setup() { |
| 83 |
- if use wayland && ! use glamor; then |
| 84 |
+ if use wayland && use minimal; then |
| 85 |
ewarn "glamor is necessary for acceleration under Xwayland." |
| 86 |
ewarn "Performance may be unacceptable without it." |
| 87 |
+ ewarn "Build with USE=-minimal to enable glamor." |
| 88 |
fi |
| 89 |
|
| 90 |
# localstatedir is used for the log location; we need to override the default |
| 91 |
@@ -150,7 +147,6 @@ pkg_setup() { |
| 92 |
$(use_enable ipv6) |
| 93 |
$(use_enable debug) |
| 94 |
$(use_enable dmx) |
| 95 |
- $(use_enable glamor) |
| 96 |
$(use_enable kdrive) |
| 97 |
$(use_enable unwind libunwind) |
| 98 |
$(use_enable wayland xwayland) |
| 99 |
@@ -159,6 +155,7 @@ pkg_setup() { |
| 100 |
$(use_enable !minimal dri) |
| 101 |
$(use_enable !minimal dri2) |
| 102 |
$(use_enable !minimal dri3) |
| 103 |
+ $(use_enable !minimal glamor) |
| 104 |
$(use_enable !minimal glx) |
| 105 |
$(use_enable xcsecurity) |
| 106 |
$(use_enable xephyr) |
| 107 |
|
| 108 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 109 |
index e9c4e004534..25dac9a8620 100644 |
| 110 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 111 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 112 |
@@ -4,6 +4,7 @@ |
| 113 |
EAPI=7 |
| 114 |
|
| 115 |
XORG_DOC=doc |
| 116 |
+XORG_EAUTORECONF="yes" |
| 117 |
inherit xorg-3 multilib flag-o-matic |
| 118 |
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 119 |
|
| 120 |
@@ -14,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then |
| 121 |
fi |
| 122 |
|
| 123 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 124 |
-IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
| 125 |
+IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
| 126 |
|
| 127 |
CDEPEND="libglvnd? ( |
| 128 |
media-libs/libglvnd |
| 129 |
@@ -51,11 +52,6 @@ CDEPEND="libglvnd? ( |
| 130 |
>=x11-libs/libXres-1.0.3 |
| 131 |
>=x11-libs/libXtst-1.0.99.2 |
| 132 |
) |
| 133 |
- glamor? ( |
| 134 |
- media-libs/libepoxy[X,egl(+)] |
| 135 |
- >=media-libs/mesa-18[egl,gbm] |
| 136 |
- !x11-libs/glamor |
| 137 |
- ) |
| 138 |
kdrive? ( |
| 139 |
>=x11-libs/libXext-1.0.5 |
| 140 |
x11-libs/libXv |
| 141 |
@@ -71,7 +67,8 @@ CDEPEND="libglvnd? ( |
| 142 |
!minimal? ( |
| 143 |
>=x11-libs/libX11-1.1.5 |
| 144 |
>=x11-libs/libXext-1.0.5 |
| 145 |
- >=media-libs/mesa-18[X(+)] |
| 146 |
+ >=media-libs/mesa-18[X(+),egl,gbm] |
| 147 |
+ media-libs/libepoxy[X,egl(+)] |
| 148 |
) |
| 149 |
udev? ( virtual/libudev:= ) |
| 150 |
unwind? ( sys-libs/libunwind ) |
| 151 |
@@ -118,7 +115,7 @@ REQUIRED_USE="!minimal? ( |
| 152 |
) |
| 153 |
elogind? ( udev ) |
| 154 |
?? ( elogind systemd ) |
| 155 |
- minimal? ( !glamor !wayland ) |
| 156 |
+ minimal? ( !wayland ) |
| 157 |
xephyr? ( kdrive )" |
| 158 |
|
| 159 |
UPSTREAMED_PATCHES=( |
| 160 |
@@ -132,9 +129,10 @@ PATCHES=( |
| 161 |
) |
| 162 |
|
| 163 |
pkg_setup() { |
| 164 |
- if use wayland && ! use glamor; then |
| 165 |
+ if use wayland && use minimal; then |
| 166 |
ewarn "glamor is necessary for acceleration under Xwayland." |
| 167 |
ewarn "Performance may be unacceptable without it." |
| 168 |
+ ewarn "Build with USE=-minimal to enable glamor." |
| 169 |
fi |
| 170 |
|
| 171 |
# localstatedir is used for the log location; we need to override the default |
| 172 |
@@ -146,7 +144,6 @@ pkg_setup() { |
| 173 |
$(use_enable ipv6) |
| 174 |
$(use_enable debug) |
| 175 |
$(use_enable dmx) |
| 176 |
- $(use_enable glamor) |
| 177 |
$(use_enable kdrive) |
| 178 |
$(use_enable unwind libunwind) |
| 179 |
$(use_enable wayland xwayland) |
| 180 |
@@ -155,6 +152,7 @@ pkg_setup() { |
| 181 |
$(use_enable !minimal dri) |
| 182 |
$(use_enable !minimal dri2) |
| 183 |
$(use_enable !minimal dri3) |
| 184 |
+ $(use_enable !minimal glamor) |
| 185 |
$(use_enable !minimal glx) |
| 186 |
$(use_enable xcsecurity) |
| 187 |
$(use_enable xephyr) |
Archives