1 |
commit: ea5504ecb9e9163a17c7f693d377b2d8e7e15fa7 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 1 06:23:17 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 1 06:23:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5504ec |
7 |
|
8 |
x11-base/xorg-server: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
x11-base/xorg-server/Manifest | 3 - |
13 |
.../files/xorg-server-1.19.4-sysmacros.patch | 36 ---- |
14 |
...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch | 39 ---- |
15 |
x11-base/xorg-server/metadata.xml | 1 - |
16 |
x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild | 224 --------------------- |
17 |
x11-base/xorg-server/xorg-server-1.20.1.ebuild | 221 -------------------- |
18 |
x11-base/xorg-server/xorg-server-1.20.2.ebuild | 221 -------------------- |
19 |
7 files changed, 745 deletions(-) |
20 |
|
21 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
22 |
index 290c8d10b68..4dc15913393 100644 |
23 |
--- a/x11-base/xorg-server/Manifest |
24 |
+++ b/x11-base/xorg-server/Manifest |
25 |
@@ -1,4 +1 @@ |
26 |
-DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c |
27 |
-DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b |
28 |
-DIST xorg-server-1.20.2.tar.bz2 6204242 BLAKE2B 05333d12ca3ca2bca879410093fb193dc2476780b857cd22dcfb22d0dffe0e17afd161ee3a87030bd76ff4109fa1884768614f0bc26318d576f7c65b885aa425 SHA512 1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7 |
29 |
DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4 SHA512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba |
30 |
|
31 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch |
32 |
deleted file mode 100644 |
33 |
index 8a3cb769292..00000000000 |
34 |
--- a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch |
35 |
+++ /dev/null |
36 |
@@ -1,36 +0,0 @@ |
37 |
-From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001 |
38 |
-From: Mart Raudsepp <leio@g.o> |
39 |
-Date: Wed, 11 Oct 2017 16:11:49 +0300 |
40 |
-Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor |
41 |
- functions for new glibc |
42 |
- |
43 |
-Commits d732c36597fa and 84e3b96b5313 added the include to some files, but |
44 |
-missed config/udev.c, where the major and minor functions are used as well. |
45 |
-This should be Linux-only, so we don't need the sys/mkdev.h case here for |
46 |
-Solaris. |
47 |
- |
48 |
-Signed-off-by: Mart Raudsepp <leio@g.o> |
49 |
---- |
50 |
-https://bugs.gentoo.org/633530 |
51 |
-https://patchwork.freedesktop.org/patch/181800/ |
52 |
- |
53 |
- config/udev.c | 3 +++ |
54 |
- 1 file changed, 3 insertions(+) |
55 |
- |
56 |
-diff --git a/config/udev.c b/config/udev.c |
57 |
-index 932f230..b3b8d0f 100644 |
58 |
---- a/config/udev.c |
59 |
-+++ b/config/udev.c |
60 |
-@@ -30,6 +30,9 @@ |
61 |
- #include <libudev.h> |
62 |
- #include <ctype.h> |
63 |
- #include <unistd.h> |
64 |
-+#ifdef HAVE_SYS_SYSMACROS_H |
65 |
-+#include <sys/sysmacros.h> |
66 |
-+#endif |
67 |
- |
68 |
- #include "input.h" |
69 |
- #include "inputstr.h" |
70 |
--- |
71 |
-2.10.2 |
72 |
- |
73 |
|
74 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch |
75 |
deleted file mode 100644 |
76 |
index d7e5e511e5d..00000000000 |
77 |
--- a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch |
78 |
+++ /dev/null |
79 |
@@ -1,39 +0,0 @@ |
80 |
-From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001 |
81 |
-From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@×××××.com> |
82 |
-Date: Tue, 28 Nov 2017 09:23:29 +0200 |
83 |
-Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual |
84 |
-MIME-Version: 1.0 |
85 |
-Content-Type: text/plain; charset=UTF-8 |
86 |
-Content-Transfer-Encoding: 8bit |
87 |
- |
88 |
-This fixes blending issues seen with kwin and gnome-shell when |
89 |
-32bit visual has sRGB capability set. |
90 |
- |
91 |
-Reviewed-by: Adam Jackson <ajax@××××××.com> |
92 |
-Signed-off-by: Tapani Pälli <tapani.palli@×××××.com> |
93 |
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699 |
94 |
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646 |
95 |
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655 |
96 |
---- |
97 |
- glx/glxscreens.c | 5 +++++ |
98 |
- 1 file changed, 5 insertions(+) |
99 |
- |
100 |
-diff --git a/glx/glxscreens.c b/glx/glxscreens.c |
101 |
-index 73444152a..596d972e0 100644 |
102 |
---- a/glx/glxscreens.c |
103 |
-+++ b/glx/glxscreens.c |
104 |
-@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual) |
105 |
- /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */ |
106 |
- if (visual->nplanes == 32 && config->rgbBits != 32) |
107 |
- continue; |
108 |
-+ /* If it's the 32-bit RGBA visual, do not pick sRGB capable config. |
109 |
-+ * This can cause issues with compositors that are not sRGB aware. |
110 |
-+ */ |
111 |
-+ if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE) |
112 |
-+ continue; |
113 |
- /* Can't use the same FBconfig for multiple X visuals. I think. */ |
114 |
- if (config->visualID != 0) |
115 |
- continue; |
116 |
--- |
117 |
-2.17.0 |
118 |
- |
119 |
|
120 |
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml |
121 |
index 8c8c243082e..74e52195b25 100644 |
122 |
--- a/x11-base/xorg-server/metadata.xml |
123 |
+++ b/x11-base/xorg-server/metadata.xml |
124 |
@@ -9,7 +9,6 @@ |
125 |
<flag name="dmx">Build the Distributed Multiheaded X server</flag> |
126 |
<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> |
127 |
<flag name="kdrive">Build the kdrive X servers</flag> |
128 |
- <flag name="tslib">Build with tslib support for touchscreen devices</flag> |
129 |
<flag name="unwind">Enable libunwind usage for backtraces</flag> |
130 |
<flag name="xcsecurity">Build Security extension</flag> |
131 |
<flag name="xnest">Build the Xnest server</flag> |
132 |
|
133 |
diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild |
134 |
deleted file mode 100644 |
135 |
index 26685badc18..00000000000 |
136 |
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild |
137 |
+++ /dev/null |
138 |
@@ -1,224 +0,0 @@ |
139 |
-# Copyright 1999-2018 Gentoo Foundation |
140 |
-# Distributed under the terms of the GNU General Public License v2 |
141 |
- |
142 |
-EAPI=5 |
143 |
- |
144 |
-XORG_DOC=doc |
145 |
-inherit xorg-2 multilib versionator flag-o-matic |
146 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
147 |
- |
148 |
-DESCRIPTION="X.Org X servers" |
149 |
-SLOT="0/${PV}" |
150 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
151 |
- |
152 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
153 |
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" |
154 |
- |
155 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
156 |
- !libressl? ( dev-libs/openssl:0= ) |
157 |
- libressl? ( dev-libs/libressl:0= ) |
158 |
- >=x11-apps/iceauth-1.0.2 |
159 |
- >=x11-apps/rgb-1.0.3 |
160 |
- >=x11-apps/xauth-1.0.3 |
161 |
- x11-apps/xkbcomp |
162 |
- >=x11-libs/libdrm-2.4.46 |
163 |
- >=x11-libs/libpciaccess-0.12.901 |
164 |
- >=x11-libs/libXau-1.0.4 |
165 |
- >=x11-libs/libXdmcp-1.0.2 |
166 |
- >=x11-libs/libXfont2-2.0.1 |
167 |
- >=x11-libs/libxkbfile-1.0.4 |
168 |
- >=x11-libs/libxshmfence-1.1 |
169 |
- >=x11-libs/pixman-0.27.2 |
170 |
- >=x11-libs/xtrans-1.3.5 |
171 |
- >=x11-misc/xbitmaps-1.0.1 |
172 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
173 |
- dmx? ( |
174 |
- x11-libs/libXt |
175 |
- >=x11-libs/libdmx-1.0.99.1 |
176 |
- >=x11-libs/libX11-1.1.5 |
177 |
- >=x11-libs/libXaw-1.0.4 |
178 |
- >=x11-libs/libXext-1.0.99.4 |
179 |
- >=x11-libs/libXfixes-5.0 |
180 |
- >=x11-libs/libXi-1.2.99.1 |
181 |
- >=x11-libs/libXmu-1.0.3 |
182 |
- x11-libs/libXrender |
183 |
- >=x11-libs/libXres-1.0.3 |
184 |
- >=x11-libs/libXtst-1.0.99.2 |
185 |
- ) |
186 |
- glamor? ( |
187 |
- media-libs/libepoxy[X] |
188 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
189 |
- !x11-libs/glamor |
190 |
- ) |
191 |
- kdrive? ( |
192 |
- >=x11-libs/libXext-1.0.5 |
193 |
- x11-libs/libXv |
194 |
- ) |
195 |
- xephyr? ( |
196 |
- x11-libs/libxcb[xkb] |
197 |
- x11-libs/xcb-util |
198 |
- x11-libs/xcb-util-image |
199 |
- x11-libs/xcb-util-keysyms |
200 |
- x11-libs/xcb-util-renderutil |
201 |
- x11-libs/xcb-util-wm |
202 |
- ) |
203 |
- !minimal? ( |
204 |
- >=x11-libs/libX11-1.1.5 |
205 |
- >=x11-libs/libXext-1.0.5 |
206 |
- >=media-libs/mesa-10.3.4-r1 |
207 |
- ) |
208 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
209 |
- udev? ( >=virtual/udev-150 ) |
210 |
- unwind? ( sys-libs/libunwind ) |
211 |
- wayland? ( |
212 |
- >=dev-libs/wayland-1.3.0 |
213 |
- media-libs/libepoxy |
214 |
- >=dev-libs/wayland-protocols-1.1 |
215 |
- ) |
216 |
- >=x11-apps/xinit-1.3.3-r1 |
217 |
- systemd? ( |
218 |
- sys-apps/dbus |
219 |
- sys-apps/systemd |
220 |
- )" |
221 |
- |
222 |
-DEPEND="${CDEPEND} |
223 |
- sys-devel/flex |
224 |
- x11-base/xorg-proto |
225 |
- dmx? ( |
226 |
- doc? ( |
227 |
- || ( |
228 |
- www-client/links |
229 |
- www-client/lynx |
230 |
- www-client/w3m |
231 |
- ) |
232 |
- ) |
233 |
- )" |
234 |
- |
235 |
-RDEPEND="${CDEPEND} |
236 |
- selinux? ( sec-policy/selinux-xserver ) |
237 |
- !x11-drivers/xf86-video-modesetting |
238 |
-" |
239 |
- |
240 |
-PDEPEND=" |
241 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
242 |
- |
243 |
-REQUIRED_USE="!minimal? ( |
244 |
- || ( ${IUSE_SERVERS} ) |
245 |
- ) |
246 |
- xephyr? ( kdrive )" |
247 |
- |
248 |
-#UPSTREAMED_PATCHES=( |
249 |
-# "${WORKDIR}/patches/" |
250 |
-#) |
251 |
- |
252 |
-PATCHES=( |
253 |
- "${UPSTREAMED_PATCHES[@]}" |
254 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
255 |
- # needed for new eselect-opengl, bug #541232 |
256 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
257 |
- "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 |
258 |
- "${FILESDIR}"/${PN}-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch #653688 |
259 |
-) |
260 |
- |
261 |
-pkg_pretend() { |
262 |
- # older gcc is not supported |
263 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
264 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
265 |
-} |
266 |
- |
267 |
-pkg_setup() { |
268 |
- if use wayland && ! use glamor; then |
269 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
270 |
- ewarn "Performance may be unacceptable without it." |
271 |
- fi |
272 |
-} |
273 |
- |
274 |
-src_configure() { |
275 |
- # localstatedir is used for the log location; we need to override the default |
276 |
- # from ebuild.sh |
277 |
- # sysconfdir is used for the xorg.conf location; same applies |
278 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
279 |
- # package it somewhere |
280 |
- XORG_CONFIGURE_OPTIONS=( |
281 |
- $(use_enable ipv6) |
282 |
- $(use_enable debug) |
283 |
- $(use_enable dmx) |
284 |
- $(use_enable glamor) |
285 |
- $(use_enable kdrive) |
286 |
- $(use_enable kdrive kdrive-kbd) |
287 |
- $(use_enable kdrive kdrive-mouse) |
288 |
- $(use_enable kdrive kdrive-evdev) |
289 |
- $(use_enable suid install-setuid) |
290 |
- $(use_enable tslib) |
291 |
- $(use_enable unwind libunwind) |
292 |
- $(use_enable wayland xwayland) |
293 |
- $(use_enable !minimal record) |
294 |
- $(use_enable !minimal xfree86-utils) |
295 |
- $(use_enable !minimal dri) |
296 |
- $(use_enable !minimal dri2) |
297 |
- $(use_enable !minimal glx) |
298 |
- $(use_enable xcsecurity) |
299 |
- $(use_enable xephyr) |
300 |
- $(use_enable xnest) |
301 |
- $(use_enable xorg) |
302 |
- $(use_enable xvfb) |
303 |
- $(use_enable udev config-udev) |
304 |
- $(use_with doc doxygen) |
305 |
- $(use_with doc xmlto) |
306 |
- $(use_with systemd systemd-daemon) |
307 |
- $(use_enable systemd systemd-logind) |
308 |
- --enable-libdrm |
309 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
310 |
- --localstatedir="${EPREFIX}"/var |
311 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
312 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
313 |
- --disable-config-hal |
314 |
- --disable-linux-acpi |
315 |
- --without-dtrace |
316 |
- --without-fop |
317 |
- --with-os-vendor=Gentoo |
318 |
- --with-sha1=libcrypto |
319 |
- ) |
320 |
- |
321 |
- xorg-2_src_configure |
322 |
-} |
323 |
- |
324 |
-src_install() { |
325 |
- xorg-2_src_install |
326 |
- |
327 |
- server_based_install |
328 |
- |
329 |
- if ! use minimal && use xorg; then |
330 |
- # Install xorg.conf.example into docs |
331 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
332 |
- fi |
333 |
- |
334 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
335 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
336 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
337 |
- |
338 |
- # install the @x11-module-rebuild set for Portage |
339 |
- insinto /usr/share/portage/config/sets |
340 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
341 |
-} |
342 |
- |
343 |
-pkg_postinst() { |
344 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
345 |
- eselect opengl set xorg-x11 --use-old |
346 |
-} |
347 |
- |
348 |
-pkg_postrm() { |
349 |
- # Get rid of module dir to ensure opengl-update works properly |
350 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
351 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
352 |
- fi |
353 |
-} |
354 |
- |
355 |
-server_based_install() { |
356 |
- if ! use xorg; then |
357 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
358 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
359 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
360 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
361 |
- fi |
362 |
-} |
363 |
|
364 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.1.ebuild b/x11-base/xorg-server/xorg-server-1.20.1.ebuild |
365 |
deleted file mode 100644 |
366 |
index e721825fa7e..00000000000 |
367 |
--- a/x11-base/xorg-server/xorg-server-1.20.1.ebuild |
368 |
+++ /dev/null |
369 |
@@ -1,221 +0,0 @@ |
370 |
-# Copyright 1999-2018 Gentoo Foundation |
371 |
-# Distributed under the terms of the GNU General Public License v2 |
372 |
- |
373 |
-EAPI=5 |
374 |
- |
375 |
-XORG_EAUTORECONF=yes |
376 |
-XORG_DOC=doc |
377 |
-inherit xorg-2 multilib versionator flag-o-matic |
378 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
379 |
- |
380 |
-DESCRIPTION="X.Org X servers" |
381 |
-SLOT="0/${PV}" |
382 |
-if [[ ${PV} != 9999* ]]; then |
383 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
384 |
-fi |
385 |
- |
386 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
387 |
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" |
388 |
- |
389 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
390 |
- !libressl? ( dev-libs/openssl:0= ) |
391 |
- libressl? ( dev-libs/libressl:0= ) |
392 |
- >=x11-apps/iceauth-1.0.2 |
393 |
- >=x11-apps/rgb-1.0.3 |
394 |
- >=x11-apps/xauth-1.0.3 |
395 |
- x11-apps/xkbcomp |
396 |
- >=x11-libs/libdrm-2.4.89 |
397 |
- >=x11-libs/libpciaccess-0.12.901 |
398 |
- >=x11-libs/libXau-1.0.4 |
399 |
- >=x11-libs/libXdmcp-1.0.2 |
400 |
- >=x11-libs/libXfont2-2.0.1 |
401 |
- >=x11-libs/libxkbfile-1.0.4 |
402 |
- >=x11-libs/libxshmfence-1.1 |
403 |
- >=x11-libs/pixman-0.27.2 |
404 |
- >=x11-libs/xtrans-1.3.5 |
405 |
- >=x11-misc/xbitmaps-1.0.1 |
406 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
407 |
- dmx? ( |
408 |
- x11-libs/libXt |
409 |
- >=x11-libs/libdmx-1.0.99.1 |
410 |
- >=x11-libs/libX11-1.1.5 |
411 |
- >=x11-libs/libXaw-1.0.4 |
412 |
- >=x11-libs/libXext-1.0.99.4 |
413 |
- >=x11-libs/libXfixes-5.0 |
414 |
- >=x11-libs/libXi-1.2.99.1 |
415 |
- >=x11-libs/libXmu-1.0.3 |
416 |
- x11-libs/libXrender |
417 |
- >=x11-libs/libXres-1.0.3 |
418 |
- >=x11-libs/libXtst-1.0.99.2 |
419 |
- ) |
420 |
- glamor? ( |
421 |
- media-libs/libepoxy[X] |
422 |
- >=media-libs/mesa-18[egl,gbm] |
423 |
- !x11-libs/glamor |
424 |
- ) |
425 |
- kdrive? ( |
426 |
- >=x11-libs/libXext-1.0.5 |
427 |
- x11-libs/libXv |
428 |
- ) |
429 |
- xephyr? ( |
430 |
- x11-libs/libxcb[xkb] |
431 |
- x11-libs/xcb-util |
432 |
- x11-libs/xcb-util-image |
433 |
- x11-libs/xcb-util-keysyms |
434 |
- x11-libs/xcb-util-renderutil |
435 |
- x11-libs/xcb-util-wm |
436 |
- ) |
437 |
- !minimal? ( |
438 |
- >=x11-libs/libX11-1.1.5 |
439 |
- >=x11-libs/libXext-1.0.5 |
440 |
- >=media-libs/mesa-18 |
441 |
- ) |
442 |
- udev? ( virtual/libudev:= ) |
443 |
- unwind? ( sys-libs/libunwind ) |
444 |
- wayland? ( |
445 |
- >=dev-libs/wayland-1.3.0 |
446 |
- media-libs/libepoxy |
447 |
- >=dev-libs/wayland-protocols-1.1 |
448 |
- ) |
449 |
- >=x11-apps/xinit-1.3.3-r1 |
450 |
- systemd? ( |
451 |
- sys-apps/dbus |
452 |
- sys-apps/systemd |
453 |
- )" |
454 |
- |
455 |
-DEPEND="${CDEPEND} |
456 |
- sys-devel/flex |
457 |
- >=x11-base/xorg-proto-2018.3 |
458 |
- dmx? ( |
459 |
- doc? ( |
460 |
- || ( |
461 |
- www-client/links |
462 |
- www-client/lynx |
463 |
- www-client/w3m |
464 |
- ) |
465 |
- ) |
466 |
- )" |
467 |
- |
468 |
-RDEPEND="${CDEPEND} |
469 |
- selinux? ( sec-policy/selinux-xserver ) |
470 |
- !x11-drivers/xf86-video-modesetting |
471 |
-" |
472 |
- |
473 |
-PDEPEND=" |
474 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
475 |
- |
476 |
-REQUIRED_USE="!minimal? ( |
477 |
- || ( ${IUSE_SERVERS} ) |
478 |
- ) |
479 |
- xephyr? ( kdrive )" |
480 |
- |
481 |
-UPSTREAMED_PATCHES=( |
482 |
-) |
483 |
- |
484 |
-PATCHES=( |
485 |
- "${UPSTREAMED_PATCHES[@]}" |
486 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
487 |
- # needed for new eselect-opengl, bug #541232 |
488 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
489 |
-) |
490 |
- |
491 |
-pkg_pretend() { |
492 |
- # older gcc is not supported |
493 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
494 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
495 |
-} |
496 |
- |
497 |
-pkg_setup() { |
498 |
- if use wayland && ! use glamor; then |
499 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
500 |
- ewarn "Performance may be unacceptable without it." |
501 |
- fi |
502 |
-} |
503 |
- |
504 |
-src_configure() { |
505 |
- # localstatedir is used for the log location; we need to override the default |
506 |
- # from ebuild.sh |
507 |
- # sysconfdir is used for the xorg.conf location; same applies |
508 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
509 |
- # package it somewhere |
510 |
- XORG_CONFIGURE_OPTIONS=( |
511 |
- $(use_enable ipv6) |
512 |
- $(use_enable debug) |
513 |
- $(use_enable dmx) |
514 |
- $(use_enable glamor) |
515 |
- $(use_enable kdrive) |
516 |
- $(use_enable unwind libunwind) |
517 |
- $(use_enable wayland xwayland) |
518 |
- $(use_enable !minimal record) |
519 |
- $(use_enable !minimal xfree86-utils) |
520 |
- $(use_enable !minimal dri) |
521 |
- $(use_enable !minimal dri2) |
522 |
- $(use_enable !minimal dri3) |
523 |
- $(use_enable !minimal glx) |
524 |
- $(use_enable xcsecurity) |
525 |
- $(use_enable xephyr) |
526 |
- $(use_enable xnest) |
527 |
- $(use_enable xorg) |
528 |
- $(use_enable xvfb) |
529 |
- $(use_enable udev config-udev) |
530 |
- $(use_with doc doxygen) |
531 |
- $(use_with doc xmlto) |
532 |
- $(use_with systemd systemd-daemon) |
533 |
- $(use_enable systemd systemd-logind) |
534 |
- $(use_enable systemd suid-wrapper) |
535 |
- $(use_enable !systemd install-setuid) |
536 |
- --enable-libdrm |
537 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
538 |
- --localstatedir="${EPREFIX}"/var |
539 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
540 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
541 |
- --disable-config-hal |
542 |
- --disable-linux-acpi |
543 |
- --without-dtrace |
544 |
- --without-fop |
545 |
- --with-os-vendor=Gentoo |
546 |
- --with-sha1=libcrypto |
547 |
- ) |
548 |
- |
549 |
- xorg-2_src_configure |
550 |
-} |
551 |
- |
552 |
-src_install() { |
553 |
- xorg-2_src_install |
554 |
- |
555 |
- server_based_install |
556 |
- |
557 |
- if ! use minimal && use xorg; then |
558 |
- # Install xorg.conf.example into docs |
559 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
560 |
- fi |
561 |
- |
562 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
563 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
564 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
565 |
- |
566 |
- # install the @x11-module-rebuild set for Portage |
567 |
- insinto /usr/share/portage/config/sets |
568 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
569 |
-} |
570 |
- |
571 |
-pkg_postinst() { |
572 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
573 |
- eselect opengl set xorg-x11 --use-old |
574 |
-} |
575 |
- |
576 |
-pkg_postrm() { |
577 |
- # Get rid of module dir to ensure opengl-update works properly |
578 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
579 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
580 |
- fi |
581 |
-} |
582 |
- |
583 |
-server_based_install() { |
584 |
- if ! use xorg; then |
585 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
586 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
587 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
588 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
589 |
- fi |
590 |
-} |
591 |
|
592 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.2.ebuild b/x11-base/xorg-server/xorg-server-1.20.2.ebuild |
593 |
deleted file mode 100644 |
594 |
index be5e57d8cb2..00000000000 |
595 |
--- a/x11-base/xorg-server/xorg-server-1.20.2.ebuild |
596 |
+++ /dev/null |
597 |
@@ -1,221 +0,0 @@ |
598 |
-# Copyright 1999-2018 Gentoo Authors |
599 |
-# Distributed under the terms of the GNU General Public License v2 |
600 |
- |
601 |
-EAPI=5 |
602 |
- |
603 |
-XORG_EAUTORECONF=yes |
604 |
-XORG_DOC=doc |
605 |
-inherit xorg-2 multilib versionator flag-o-matic |
606 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
607 |
- |
608 |
-DESCRIPTION="X.Org X servers" |
609 |
-SLOT="0/${PV}" |
610 |
-if [[ ${PV} != 9999* ]]; then |
611 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
612 |
-fi |
613 |
- |
614 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
615 |
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" |
616 |
- |
617 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
618 |
- !libressl? ( dev-libs/openssl:0= ) |
619 |
- libressl? ( dev-libs/libressl:0= ) |
620 |
- >=x11-apps/iceauth-1.0.2 |
621 |
- >=x11-apps/rgb-1.0.3 |
622 |
- >=x11-apps/xauth-1.0.3 |
623 |
- x11-apps/xkbcomp |
624 |
- >=x11-libs/libdrm-2.4.89 |
625 |
- >=x11-libs/libpciaccess-0.12.901 |
626 |
- >=x11-libs/libXau-1.0.4 |
627 |
- >=x11-libs/libXdmcp-1.0.2 |
628 |
- >=x11-libs/libXfont2-2.0.1 |
629 |
- >=x11-libs/libxkbfile-1.0.4 |
630 |
- >=x11-libs/libxshmfence-1.1 |
631 |
- >=x11-libs/pixman-0.27.2 |
632 |
- >=x11-libs/xtrans-1.3.5 |
633 |
- >=x11-misc/xbitmaps-1.0.1 |
634 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
635 |
- dmx? ( |
636 |
- x11-libs/libXt |
637 |
- >=x11-libs/libdmx-1.0.99.1 |
638 |
- >=x11-libs/libX11-1.1.5 |
639 |
- >=x11-libs/libXaw-1.0.4 |
640 |
- >=x11-libs/libXext-1.0.99.4 |
641 |
- >=x11-libs/libXfixes-5.0 |
642 |
- >=x11-libs/libXi-1.2.99.1 |
643 |
- >=x11-libs/libXmu-1.0.3 |
644 |
- x11-libs/libXrender |
645 |
- >=x11-libs/libXres-1.0.3 |
646 |
- >=x11-libs/libXtst-1.0.99.2 |
647 |
- ) |
648 |
- glamor? ( |
649 |
- media-libs/libepoxy[X] |
650 |
- >=media-libs/mesa-18[egl,gbm] |
651 |
- !x11-libs/glamor |
652 |
- ) |
653 |
- kdrive? ( |
654 |
- >=x11-libs/libXext-1.0.5 |
655 |
- x11-libs/libXv |
656 |
- ) |
657 |
- xephyr? ( |
658 |
- x11-libs/libxcb[xkb] |
659 |
- x11-libs/xcb-util |
660 |
- x11-libs/xcb-util-image |
661 |
- x11-libs/xcb-util-keysyms |
662 |
- x11-libs/xcb-util-renderutil |
663 |
- x11-libs/xcb-util-wm |
664 |
- ) |
665 |
- !minimal? ( |
666 |
- >=x11-libs/libX11-1.1.5 |
667 |
- >=x11-libs/libXext-1.0.5 |
668 |
- >=media-libs/mesa-18 |
669 |
- ) |
670 |
- udev? ( virtual/libudev:= ) |
671 |
- unwind? ( sys-libs/libunwind ) |
672 |
- wayland? ( |
673 |
- >=dev-libs/wayland-1.3.0 |
674 |
- media-libs/libepoxy |
675 |
- >=dev-libs/wayland-protocols-1.1 |
676 |
- ) |
677 |
- >=x11-apps/xinit-1.3.3-r1 |
678 |
- systemd? ( |
679 |
- sys-apps/dbus |
680 |
- sys-apps/systemd |
681 |
- )" |
682 |
- |
683 |
-DEPEND="${CDEPEND} |
684 |
- sys-devel/flex |
685 |
- >=x11-base/xorg-proto-2018.3 |
686 |
- dmx? ( |
687 |
- doc? ( |
688 |
- || ( |
689 |
- www-client/links |
690 |
- www-client/lynx |
691 |
- www-client/w3m |
692 |
- ) |
693 |
- ) |
694 |
- )" |
695 |
- |
696 |
-RDEPEND="${CDEPEND} |
697 |
- selinux? ( sec-policy/selinux-xserver ) |
698 |
- !x11-drivers/xf86-video-modesetting |
699 |
-" |
700 |
- |
701 |
-PDEPEND=" |
702 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
703 |
- |
704 |
-REQUIRED_USE="!minimal? ( |
705 |
- || ( ${IUSE_SERVERS} ) |
706 |
- ) |
707 |
- xephyr? ( kdrive )" |
708 |
- |
709 |
-UPSTREAMED_PATCHES=( |
710 |
-) |
711 |
- |
712 |
-PATCHES=( |
713 |
- "${UPSTREAMED_PATCHES[@]}" |
714 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
715 |
- # needed for new eselect-opengl, bug #541232 |
716 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
717 |
-) |
718 |
- |
719 |
-pkg_pretend() { |
720 |
- # older gcc is not supported |
721 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
722 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
723 |
-} |
724 |
- |
725 |
-pkg_setup() { |
726 |
- if use wayland && ! use glamor; then |
727 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
728 |
- ewarn "Performance may be unacceptable without it." |
729 |
- fi |
730 |
-} |
731 |
- |
732 |
-src_configure() { |
733 |
- # localstatedir is used for the log location; we need to override the default |
734 |
- # from ebuild.sh |
735 |
- # sysconfdir is used for the xorg.conf location; same applies |
736 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
737 |
- # package it somewhere |
738 |
- XORG_CONFIGURE_OPTIONS=( |
739 |
- $(use_enable ipv6) |
740 |
- $(use_enable debug) |
741 |
- $(use_enable dmx) |
742 |
- $(use_enable glamor) |
743 |
- $(use_enable kdrive) |
744 |
- $(use_enable unwind libunwind) |
745 |
- $(use_enable wayland xwayland) |
746 |
- $(use_enable !minimal record) |
747 |
- $(use_enable !minimal xfree86-utils) |
748 |
- $(use_enable !minimal dri) |
749 |
- $(use_enable !minimal dri2) |
750 |
- $(use_enable !minimal dri3) |
751 |
- $(use_enable !minimal glx) |
752 |
- $(use_enable xcsecurity) |
753 |
- $(use_enable xephyr) |
754 |
- $(use_enable xnest) |
755 |
- $(use_enable xorg) |
756 |
- $(use_enable xvfb) |
757 |
- $(use_enable udev config-udev) |
758 |
- $(use_with doc doxygen) |
759 |
- $(use_with doc xmlto) |
760 |
- $(use_with systemd systemd-daemon) |
761 |
- $(use_enable systemd systemd-logind) |
762 |
- $(use_enable systemd suid-wrapper) |
763 |
- $(use_enable !systemd install-setuid) |
764 |
- --enable-libdrm |
765 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
766 |
- --localstatedir="${EPREFIX}"/var |
767 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
768 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
769 |
- --disable-config-hal |
770 |
- --disable-linux-acpi |
771 |
- --without-dtrace |
772 |
- --without-fop |
773 |
- --with-os-vendor=Gentoo |
774 |
- --with-sha1=libcrypto |
775 |
- ) |
776 |
- |
777 |
- xorg-2_src_configure |
778 |
-} |
779 |
- |
780 |
-src_install() { |
781 |
- xorg-2_src_install |
782 |
- |
783 |
- server_based_install |
784 |
- |
785 |
- if ! use minimal && use xorg; then |
786 |
- # Install xorg.conf.example into docs |
787 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
788 |
- fi |
789 |
- |
790 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
791 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
792 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
793 |
- |
794 |
- # install the @x11-module-rebuild set for Portage |
795 |
- insinto /usr/share/portage/config/sets |
796 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
797 |
-} |
798 |
- |
799 |
-pkg_postinst() { |
800 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
801 |
- eselect opengl set xorg-x11 --use-old |
802 |
-} |
803 |
- |
804 |
-pkg_postrm() { |
805 |
- # Get rid of module dir to ensure opengl-update works properly |
806 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
807 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
808 |
- fi |
809 |
-} |
810 |
- |
811 |
-server_based_install() { |
812 |
- if ! use xorg; then |
813 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
814 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
815 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
816 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
817 |
- fi |
818 |
-} |