1 |
commit: eb2be09ec249f29c044e37765b515e14a95e8266 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 21 04:56:14 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 21 04:56:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2be09e |
7 |
|
8 |
x11-base/xorg-server: Drop old versions |
9 |
|
10 |
Bug: https://bugs.gentoo.org/829208 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
x11-base/xorg-server/Manifest | 2 - |
14 |
x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild | 219 --------------------- |
15 |
x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild | 180 ----------------- |
16 |
x11-base/xorg-server/xorg-server-21.1.2-r2.ebuild | 184 ----------------- |
17 |
4 files changed, 585 deletions(-) |
18 |
|
19 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
20 |
index 8b79448a042f..5d64b775798f 100644 |
21 |
--- a/x11-base/xorg-server/Manifest |
22 |
+++ b/x11-base/xorg-server/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 |
25 |
DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 |
26 |
-DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d |
27 |
DIST xorg-server-21.1.2.tar.xz 4967784 BLAKE2B 352c8717dbbceb547e84610db3983bcfc83d4d72f02f6658ce6c7faa88821a60b401824e76a02bbce617d6646cd474a21823a4b7b75270512bbfd37957dff18d SHA512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def |
28 |
|
29 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 70f50b24ca30..000000000000 |
32 |
--- a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,219 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-XORG_DOC=doc |
41 |
-XORG_TARBALL_SUFFIX="xz" |
42 |
-inherit xorg-3 toolchain-funcs |
43 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
44 |
- |
45 |
-DESCRIPTION="X.Org X servers" |
46 |
-SLOT="0/${PV}" |
47 |
-if [[ ${PV} != 9999* ]]; then |
48 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" |
49 |
-fi |
50 |
- |
51 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
52 |
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" |
53 |
-RESTRICT="!test? ( test )" |
54 |
- |
55 |
-CDEPEND=" |
56 |
- media-libs/libglvnd[X] |
57 |
- dev-libs/openssl:0= |
58 |
- >=x11-apps/iceauth-1.0.2 |
59 |
- >=x11-apps/rgb-1.0.3 |
60 |
- >=x11-apps/xauth-1.0.3 |
61 |
- x11-apps/xkbcomp |
62 |
- >=x11-libs/libdrm-2.4.89 |
63 |
- >=x11-libs/libpciaccess-0.12.901 |
64 |
- >=x11-libs/libXau-1.0.4 |
65 |
- >=x11-libs/libXdmcp-1.0.2 |
66 |
- >=x11-libs/libXfont2-2.0.1 |
67 |
- >=x11-libs/libxkbfile-1.0.4 |
68 |
- >=x11-libs/libxshmfence-1.1 |
69 |
- >=x11-libs/pixman-0.27.2 |
70 |
- >=x11-misc/xbitmaps-1.0.1 |
71 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
72 |
- dmx? ( |
73 |
- x11-libs/libXt |
74 |
- >=x11-libs/libdmx-1.0.99.1 |
75 |
- >=x11-libs/libX11-1.1.5 |
76 |
- >=x11-libs/libXaw-1.0.4 |
77 |
- >=x11-libs/libXext-1.0.99.4 |
78 |
- >=x11-libs/libXfixes-5.0 |
79 |
- >=x11-libs/libXi-1.2.99.1 |
80 |
- >=x11-libs/libXmu-1.0.3 |
81 |
- x11-libs/libXrender |
82 |
- >=x11-libs/libXres-1.0.3 |
83 |
- >=x11-libs/libXtst-1.0.99.2 |
84 |
- ) |
85 |
- kdrive? ( |
86 |
- >=x11-libs/libXext-1.0.5 |
87 |
- x11-libs/libXv |
88 |
- ) |
89 |
- xephyr? ( |
90 |
- x11-libs/libxcb[xkb] |
91 |
- x11-libs/xcb-util |
92 |
- x11-libs/xcb-util-image |
93 |
- x11-libs/xcb-util-keysyms |
94 |
- x11-libs/xcb-util-renderutil |
95 |
- x11-libs/xcb-util-wm |
96 |
- ) |
97 |
- !minimal? ( |
98 |
- >=x11-libs/libX11-1.1.5 |
99 |
- >=x11-libs/libXext-1.0.5 |
100 |
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
101 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
102 |
- ) |
103 |
- udev? ( virtual/libudev:= ) |
104 |
- unwind? ( sys-libs/libunwind ) |
105 |
- >=x11-apps/xinit-1.3.3-r1 |
106 |
- systemd? ( |
107 |
- sys-apps/dbus |
108 |
- sys-apps/systemd |
109 |
- ) |
110 |
- elogind? ( |
111 |
- sys-apps/dbus |
112 |
- sys-auth/elogind[pam] |
113 |
- sys-auth/pambase[elogind] |
114 |
- ) |
115 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
116 |
-" |
117 |
-DEPEND="${CDEPEND} |
118 |
- >=x11-base/xorg-proto-2018.4 |
119 |
- >=x11-libs/xtrans-1.3.5 |
120 |
- dmx? ( |
121 |
- doc? ( |
122 |
- || ( |
123 |
- www-client/links |
124 |
- www-client/lynx |
125 |
- www-client/w3m |
126 |
- ) |
127 |
- ) |
128 |
- ) |
129 |
-" |
130 |
-RDEPEND="${CDEPEND} |
131 |
- !systemd? ( gui-libs/display-manager-init ) |
132 |
- selinux? ( sec-policy/selinux-xserver ) |
133 |
-" |
134 |
-BDEPEND=" |
135 |
- sys-devel/flex |
136 |
-" |
137 |
-PDEPEND=" |
138 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
139 |
- |
140 |
-REQUIRED_USE="!minimal? ( |
141 |
- || ( ${IUSE_SERVERS} ) |
142 |
- ) |
143 |
- elogind? ( udev ) |
144 |
- ?? ( elogind systemd ) |
145 |
- xephyr? ( kdrive )" |
146 |
- |
147 |
-UPSTREAMED_PATCHES=( |
148 |
-) |
149 |
- |
150 |
-PATCHES=( |
151 |
- "${UPSTREAMED_PATCHES[@]}" |
152 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
153 |
- # needed for new eselect-opengl, bug #541232 |
154 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
155 |
-) |
156 |
- |
157 |
-src_configure() { |
158 |
- # localstatedir is used for the log location; we need to override the default |
159 |
- # from ebuild.sh |
160 |
- # sysconfdir is used for the xorg.conf location; same applies |
161 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
162 |
- # package it somewhere |
163 |
- local XORG_CONFIGURE_OPTIONS=( |
164 |
- $(use_enable ipv6) |
165 |
- $(use_enable debug) |
166 |
- $(use_enable dmx) |
167 |
- $(use_enable kdrive) |
168 |
- $(use_enable test unit-tests) |
169 |
- $(use_enable unwind libunwind) |
170 |
- $(use_enable !minimal record) |
171 |
- $(use_enable !minimal xfree86-utils) |
172 |
- $(use_enable !minimal dri) |
173 |
- $(use_enable !minimal dri2) |
174 |
- $(use_enable !minimal dri3) |
175 |
- $(use_enable !minimal glamor) |
176 |
- $(use_enable !minimal glx) |
177 |
- $(use_enable xcsecurity) |
178 |
- $(use_enable xephyr) |
179 |
- $(use_enable xnest) |
180 |
- $(use_enable xorg) |
181 |
- $(use_enable xvfb) |
182 |
- $(use_enable udev config-udev) |
183 |
- $(use_with doc doxygen) |
184 |
- $(use_with doc xmlto) |
185 |
- $(use_with systemd systemd-daemon) |
186 |
- --disable-xwayland |
187 |
- --enable-libdrm |
188 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
189 |
- --localstatedir="${EPREFIX}"/var |
190 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
191 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
192 |
- --disable-config-hal |
193 |
- --disable-linux-acpi |
194 |
- --without-dtrace |
195 |
- --without-fop |
196 |
- --with-os-vendor=Gentoo |
197 |
- --with-sha1=libcrypto |
198 |
- CPP="$(tc-getPROG CPP cpp)" |
199 |
- ) |
200 |
- |
201 |
- if use systemd || use elogind; then |
202 |
- XORG_CONFIGURE_OPTIONS+=( |
203 |
- --enable-systemd-logind |
204 |
- --disable-install-setuid |
205 |
- $(use_enable suid suid-wrapper) |
206 |
- ) |
207 |
- else |
208 |
- XORG_CONFIGURE_OPTIONS+=( |
209 |
- --disable-systemd-logind |
210 |
- --disable-suid-wrapper |
211 |
- $(use_enable suid install-setuid) |
212 |
- ) |
213 |
- fi |
214 |
- |
215 |
- xorg-3_src_configure |
216 |
-} |
217 |
- |
218 |
-server_based_install() { |
219 |
- if ! use xorg; then |
220 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
221 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
222 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
223 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
224 |
- fi |
225 |
-} |
226 |
- |
227 |
-src_install() { |
228 |
- xorg-3_src_install |
229 |
- |
230 |
- server_based_install |
231 |
- |
232 |
- if ! use minimal && use xorg; then |
233 |
- # Install xorg.conf.example into docs |
234 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
235 |
- |
236 |
- rm \ |
237 |
- "${ED}"/usr/bin/cvt \ |
238 |
- "${ED}"/usr/share/man/man1/cvt.1 || die |
239 |
- fi |
240 |
- |
241 |
- # install the @x11-module-rebuild set for Portage |
242 |
- insinto /usr/share/portage/config/sets |
243 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
244 |
- |
245 |
- find "${ED}"/var -type d -empty -delete || die |
246 |
-} |
247 |
- |
248 |
-pkg_postrm() { |
249 |
- # Get rid of module dir to ensure opengl-update works properly |
250 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
251 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
252 |
- fi |
253 |
-} |
254 |
|
255 |
diff --git a/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild |
256 |
deleted file mode 100644 |
257 |
index 9e885eb74813..000000000000 |
258 |
--- a/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild |
259 |
+++ /dev/null |
260 |
@@ -1,180 +0,0 @@ |
261 |
-# Copyright 1999-2021 Gentoo Authors |
262 |
-# Distributed under the terms of the GNU General Public License v2 |
263 |
- |
264 |
-EAPI=7 |
265 |
- |
266 |
-XORG_DOC=doc |
267 |
-XORG_TARBALL_SUFFIX="xz" |
268 |
-XORG_EAUTORECONF="no" |
269 |
-inherit xorg-3 meson |
270 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
271 |
- |
272 |
-DESCRIPTION="X.Org X servers" |
273 |
-SLOT="0/${PV}" |
274 |
-if [[ ${PV} != 9999* ]]; then |
275 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
276 |
-fi |
277 |
- |
278 |
-IUSE_SERVERS="xephyr xnest xorg xvfb" |
279 |
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" |
280 |
-RESTRICT="!test? ( test )" |
281 |
- |
282 |
-CDEPEND=" |
283 |
- media-libs/libglvnd[X] |
284 |
- dev-libs/openssl:0= |
285 |
- >=x11-apps/iceauth-1.0.2 |
286 |
- >=x11-apps/rgb-1.0.3 |
287 |
- >=x11-apps/xauth-1.0.3 |
288 |
- x11-apps/xkbcomp |
289 |
- >=x11-libs/libdrm-2.4.89 |
290 |
- >=x11-libs/libpciaccess-0.12.901 |
291 |
- >=x11-libs/libXau-1.0.4 |
292 |
- >=x11-libs/libXdmcp-1.0.2 |
293 |
- >=x11-libs/libXfont2-2.0.1 |
294 |
- >=x11-libs/libxcvt-0.1.0 |
295 |
- >=x11-libs/libxkbfile-1.0.4 |
296 |
- >=x11-libs/libxshmfence-1.1 |
297 |
- >=x11-libs/pixman-0.27.2 |
298 |
- >=x11-misc/xbitmaps-1.0.1 |
299 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
300 |
- >=x11-libs/libXext-1.0.5 |
301 |
- x11-libs/libXv |
302 |
- xephyr? ( |
303 |
- x11-libs/libxcb[xkb] |
304 |
- x11-libs/xcb-util |
305 |
- x11-libs/xcb-util-image |
306 |
- x11-libs/xcb-util-keysyms |
307 |
- x11-libs/xcb-util-renderutil |
308 |
- x11-libs/xcb-util-wm |
309 |
- ) |
310 |
- !minimal? ( |
311 |
- >=x11-libs/libX11-1.1.5 |
312 |
- >=x11-libs/libXext-1.0.5 |
313 |
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
314 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
315 |
- ) |
316 |
- udev? ( virtual/libudev:= ) |
317 |
- unwind? ( sys-libs/libunwind ) |
318 |
- >=x11-apps/xinit-1.3.3-r1 |
319 |
- selinux? ( sys-libs/libselinux ) |
320 |
- systemd? ( |
321 |
- sys-apps/dbus |
322 |
- sys-apps/systemd |
323 |
- ) |
324 |
- elogind? ( |
325 |
- sys-apps/dbus |
326 |
- sys-auth/elogind[pam] |
327 |
- sys-auth/pambase[elogind] |
328 |
- ) |
329 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
330 |
-" |
331 |
-DEPEND="${CDEPEND} |
332 |
- >=x11-base/xorg-proto-2021.4.99.2 |
333 |
- >=x11-libs/xtrans-1.3.5 |
334 |
- doc? ( |
335 |
- x11-base/xorg-sgml-doctools |
336 |
- ) |
337 |
-" |
338 |
-RDEPEND="${CDEPEND} |
339 |
- !systemd? ( gui-libs/display-manager-init ) |
340 |
- selinux? ( sec-policy/selinux-xserver ) |
341 |
-" |
342 |
-BDEPEND=" |
343 |
- sys-devel/flex |
344 |
-" |
345 |
-PDEPEND=" |
346 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
347 |
- |
348 |
-REQUIRED_USE="!minimal? ( |
349 |
- || ( ${IUSE_SERVERS} ) |
350 |
- ) |
351 |
- elogind? ( udev ) |
352 |
- ?? ( elogind systemd )" |
353 |
- |
354 |
-UPSTREAMED_PATCHES=( |
355 |
- "${FILESDIR}"/${P}-DPI-revert.patch |
356 |
-) |
357 |
- |
358 |
-PATCHES=( |
359 |
- "${UPSTREAMED_PATCHES[@]}" |
360 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
361 |
- # needed for new eselect-opengl, bug #541232 |
362 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
363 |
-) |
364 |
- |
365 |
-src_configure() { |
366 |
- # localstatedir is used for the log location; we need to override the default |
367 |
- # from ebuild.sh |
368 |
- # sysconfdir is used for the xorg.conf location; same applies |
369 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
370 |
- # package it somewhere |
371 |
- |
372 |
- local emesonargs=( |
373 |
- --localstatedir "${EPREFIX}/var" |
374 |
- --sysconfdir "${EPREFIX}/etc/X11" |
375 |
- --buildtype $(usex debug debug plain) |
376 |
- -Db_ndebug=$(usex debug false true) |
377 |
- $(meson_use doc docs) |
378 |
- $(meson_use !minimal dri1) |
379 |
- $(meson_use !minimal dri2) |
380 |
- $(meson_use !minimal dri3) |
381 |
- $(meson_use !minimal glamor) |
382 |
- $(meson_use !minimal glx) |
383 |
- $(meson_use udev) |
384 |
- $(meson_use udev udev_kms) |
385 |
- $(meson_use unwind libunwind) |
386 |
- $(meson_use xcsecurity) |
387 |
- $(meson_use xephyr) |
388 |
- $(meson_use xnest) |
389 |
- $(meson_use xorg) |
390 |
- $(meson_use xvfb) |
391 |
- -Ddefault_font_path="${EPREFIX}"/usr/share/fonts |
392 |
- -Ddrm=true |
393 |
- -Ddtrace=false |
394 |
- -Dipv6=true |
395 |
- -Dhal=false |
396 |
- -Dlinux_acpi=false |
397 |
- -Dlinux_apm=false |
398 |
- -Dsha1=libcrypto |
399 |
- -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" |
400 |
- ) |
401 |
- |
402 |
- if use systemd || use elogind; then |
403 |
- emesonargs+=( |
404 |
- -Dsystemd_logind=true |
405 |
- $(meson_use suid suid_wrapper) |
406 |
- ) |
407 |
- else |
408 |
- emesonargs+=( |
409 |
- -Dsystemd_logind=false |
410 |
- $(meson_use suid suid_wrapper) |
411 |
- ) |
412 |
- fi |
413 |
- |
414 |
- meson_src_configure |
415 |
-} |
416 |
- |
417 |
-src_install() { |
418 |
- meson_src_install |
419 |
- |
420 |
- #The new meson build system do not leave X symlink |
421 |
- ln -s Xorg "${ED}"/usr/bin/X |
422 |
- |
423 |
- if ! use xorg; then |
424 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
425 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
426 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
427 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
428 |
- fi |
429 |
- |
430 |
- # install the @x11-module-rebuild set for Portage |
431 |
- insinto /usr/share/portage/config/sets |
432 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
433 |
-} |
434 |
- |
435 |
-pkg_postrm() { |
436 |
- # Get rid of module dir to ensure opengl-update works properly |
437 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
438 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
439 |
- fi |
440 |
-} |
441 |
|
442 |
diff --git a/x11-base/xorg-server/xorg-server-21.1.2-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.2-r2.ebuild |
443 |
deleted file mode 100644 |
444 |
index 05df79d40fe4..000000000000 |
445 |
--- a/x11-base/xorg-server/xorg-server-21.1.2-r2.ebuild |
446 |
+++ /dev/null |
447 |
@@ -1,184 +0,0 @@ |
448 |
-# Copyright 1999-2021 Gentoo Authors |
449 |
-# Distributed under the terms of the GNU General Public License v2 |
450 |
- |
451 |
-EAPI=7 |
452 |
- |
453 |
-XORG_TARBALL_SUFFIX="xz" |
454 |
-XORG_EAUTORECONF="no" |
455 |
-inherit xorg-3 meson |
456 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
457 |
- |
458 |
-DESCRIPTION="X.Org X servers" |
459 |
-SLOT="0/${PV}" |
460 |
-if [[ ${PV} != 9999* ]]; then |
461 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
462 |
-fi |
463 |
- |
464 |
-IUSE_SERVERS="xephyr xnest xorg xvfb" |
465 |
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" |
466 |
-RESTRICT="!test? ( test )" |
467 |
- |
468 |
-CDEPEND=" |
469 |
- media-libs/libglvnd[X] |
470 |
- dev-libs/libbsd |
471 |
- dev-libs/openssl:0= |
472 |
- >=x11-apps/iceauth-1.0.2 |
473 |
- >=x11-apps/rgb-1.0.3 |
474 |
- >=x11-apps/xauth-1.0.3 |
475 |
- x11-apps/xkbcomp |
476 |
- >=x11-libs/libdrm-2.4.89 |
477 |
- >=x11-libs/libpciaccess-0.12.901 |
478 |
- >=x11-libs/libXau-1.0.4 |
479 |
- >=x11-libs/libXdmcp-1.0.2 |
480 |
- >=x11-libs/libXfont2-2.0.1 |
481 |
- >=x11-libs/libxcvt-0.1.0 |
482 |
- >=x11-libs/libxkbfile-1.0.4 |
483 |
- >=x11-libs/libxshmfence-1.1 |
484 |
- >=x11-libs/pixman-0.27.2 |
485 |
- >=x11-misc/xbitmaps-1.0.1 |
486 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
487 |
- >=x11-libs/libXext-1.0.5 |
488 |
- x11-libs/libXv |
489 |
- xephyr? ( |
490 |
- x11-libs/libxcb[xkb] |
491 |
- x11-libs/xcb-util |
492 |
- x11-libs/xcb-util-image |
493 |
- x11-libs/xcb-util-keysyms |
494 |
- x11-libs/xcb-util-renderutil |
495 |
- x11-libs/xcb-util-wm |
496 |
- ) |
497 |
- !minimal? ( |
498 |
- >=x11-libs/libX11-1.1.5 |
499 |
- >=x11-libs/libXext-1.0.5 |
500 |
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
501 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
502 |
- ) |
503 |
- udev? ( virtual/libudev:= ) |
504 |
- unwind? ( sys-libs/libunwind ) |
505 |
- selinux? ( sys-libs/libselinux ) |
506 |
- systemd? ( |
507 |
- sys-apps/dbus |
508 |
- sys-apps/systemd |
509 |
- ) |
510 |
- elogind? ( |
511 |
- sys-apps/dbus |
512 |
- sys-auth/elogind[pam] |
513 |
- sys-auth/pambase[elogind] |
514 |
- ) |
515 |
- !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
516 |
-" |
517 |
-DEPEND="${CDEPEND} |
518 |
- >=x11-base/xorg-proto-2021.4.99.2 |
519 |
- >=x11-libs/xtrans-1.3.5 |
520 |
- media-fonts/font-util |
521 |
-" |
522 |
-RDEPEND="${CDEPEND} |
523 |
- !systemd? ( gui-libs/display-manager-init ) |
524 |
- selinux? ( sec-policy/selinux-xserver ) |
525 |
- xorg? ( >=x11-apps/xinit-1.3.3-r1 ) |
526 |
-" |
527 |
-BDEPEND=" |
528 |
- sys-devel/flex |
529 |
-" |
530 |
-PDEPEND=" |
531 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
532 |
- |
533 |
-REQUIRED_USE="!minimal? ( |
534 |
- || ( ${IUSE_SERVERS} ) |
535 |
- ) |
536 |
- elogind? ( udev ) |
537 |
- ?? ( elogind systemd )" |
538 |
- |
539 |
-UPSTREAMED_PATCHES=( |
540 |
-) |
541 |
- |
542 |
-PATCHES=( |
543 |
- "${UPSTREAMED_PATCHES[@]}" |
544 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
545 |
- # needed for new eselect-opengl, bug #541232 |
546 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
547 |
-) |
548 |
- |
549 |
-src_configure() { |
550 |
- # localstatedir is used for the log location; we need to override the default |
551 |
- # from ebuild.sh |
552 |
- # sysconfdir is used for the xorg.conf location; same applies |
553 |
- |
554 |
- local emesonargs=( |
555 |
- --localstatedir "${EPREFIX}/var" |
556 |
- --sysconfdir "${EPREFIX}/etc/X11" |
557 |
- --buildtype $(usex debug debug plain) |
558 |
- -Db_ndebug=$(usex debug false true) |
559 |
- $(meson_use !minimal dri1) |
560 |
- $(meson_use !minimal dri2) |
561 |
- $(meson_use !minimal dri3) |
562 |
- $(meson_use !minimal glamor) |
563 |
- $(meson_use !minimal glx) |
564 |
- $(meson_use udev) |
565 |
- $(meson_use udev udev_kms) |
566 |
- $(meson_use unwind libunwind) |
567 |
- $(meson_use xcsecurity) |
568 |
- $(meson_use xephyr) |
569 |
- $(meson_use xnest) |
570 |
- $(meson_use xorg) |
571 |
- $(meson_use xvfb) |
572 |
- -Ddocs=false |
573 |
- -Ddrm=true |
574 |
- -Ddtrace=false |
575 |
- -Dipv6=true |
576 |
- -Dhal=false |
577 |
- -Dlinux_acpi=false |
578 |
- -Dlinux_apm=false |
579 |
- -Dsecure-rpc=false |
580 |
- -Dsha1=libcrypto |
581 |
- -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" |
582 |
- ) |
583 |
- |
584 |
- if [[ ${PV} == 9999 ]] ; then |
585 |
- # Gone in 21.1.x, but not in master. |
586 |
- emesonargs+=( -Dxwayland=false ) |
587 |
- fi |
588 |
- |
589 |
- if use systemd || use elogind; then |
590 |
- emesonargs+=( |
591 |
- -Dsystemd_logind=true |
592 |
- $(meson_use suid suid_wrapper) |
593 |
- ) |
594 |
- else |
595 |
- emesonargs+=( |
596 |
- -Dsystemd_logind=false |
597 |
- -Dsuid_wrapper=false |
598 |
- ) |
599 |
- fi |
600 |
- |
601 |
- meson_src_configure |
602 |
-} |
603 |
- |
604 |
-src_install() { |
605 |
- meson_src_install |
606 |
- |
607 |
- # The meson build system does not support install-setuid |
608 |
- if ! use systemd || ! use elogind; then |
609 |
- if use suid; then |
610 |
- chmod u+s "${ED}"/usr/bin/Xorg |
611 |
- fi |
612 |
- fi |
613 |
- |
614 |
- if ! use xorg; then |
615 |
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
616 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
617 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
618 |
- "${ED}"/usr/share/man/man1/Xserver.1x || die |
619 |
- fi |
620 |
- |
621 |
- # install the @x11-module-rebuild set for Portage |
622 |
- insinto /usr/share/portage/config/sets |
623 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
624 |
-} |
625 |
- |
626 |
-pkg_postrm() { |
627 |
- # Get rid of module dir to ensure opengl-update works properly |
628 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
629 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
630 |
- fi |
631 |
-} |