1 |
commit: e8ff080f8633dfaa490ce62c07068935d6ff0f7e |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 1 22:51:21 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 1 22:52:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ff080f |
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 | 1 - |
13 |
...ine-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 --------------------- |
14 |
x11-base/xorg-server/xorg-server-1.20.0.ebuild | 221 -------------------- |
15 |
3 files changed, 446 deletions(-) |
16 |
|
17 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
18 |
index f874c858676..6b4fadcebbc 100644 |
19 |
--- a/x11-base/xorg-server/Manifest |
20 |
+++ b/x11-base/xorg-server/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c |
23 |
-DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde |
24 |
DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b |
25 |
|
26 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch |
27 |
deleted file mode 100644 |
28 |
index ebf677ae9c4..00000000000 |
29 |
--- a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch |
30 |
+++ /dev/null |
31 |
@@ -1,224 +0,0 @@ |
32 |
-From eecedfffd40f0465d85347f14547ddc6b30e57df Mon Sep 17 00:00:00 2001 |
33 |
-From: Matt Turner <mattst88@×××××.com> |
34 |
-Date: Tue, 22 May 2018 21:10:55 -0700 |
35 |
-Subject: [PATCH xserver] xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on |
36 |
- alpha |
37 |
- |
38 |
-In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we |
39 |
-somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the |
40 |
-function pointer indirection was intended to support dense vs sparse and |
41 |
-sparse support is now gone, we can just make the functions static inline |
42 |
-in compiler.h and avoid all of this. |
43 |
- |
44 |
-Bugzilla: https://bugs.gentoo.org/548906 |
45 |
-Tested-by: Christopher May-Townsend <chris@××××××××××××××.uk> |
46 |
-Reviewed-by: Adam Jackson <ajax@××××××.com> |
47 |
-Signed-off-by: Matt Turner <mattst88@×××××.com> |
48 |
---- |
49 |
- configure.ac | 4 -- |
50 |
- hw/xfree86/common/compiler.h | 67 ++++++++++++++++++++++++--------- |
51 |
- hw/xfree86/os-support/bsd/Makefile.am | 3 +- |
52 |
- hw/xfree86/os-support/linux/Makefile.am | 12 ------ |
53 |
- hw/xfree86/os-support/linux/lnx_video.c | 27 ------------- |
54 |
- hw/xfree86/os-support/meson.build | 1 - |
55 |
- 6 files changed, 50 insertions(+), 64 deletions(-) |
56 |
- |
57 |
-diff --git a/configure.ac b/configure.ac |
58 |
-index ddc47faa2..0075b6ace 100644 |
59 |
---- a/configure.ac |
60 |
-+++ b/configure.ac |
61 |
-@@ -1908,9 +1908,6 @@ if test "x$XORG" = xyes; then |
62 |
- XORG_OS_SUBDIR="linux" |
63 |
- linux_acpi="no" |
64 |
- case $host_cpu in |
65 |
-- alpha*) |
66 |
-- linux_alpha=yes |
67 |
-- ;; |
68 |
- i*86|amd64*|x86_64*|ia64*) |
69 |
- linux_acpi=$enable_linux_acpi |
70 |
- ;; |
71 |
-@@ -2075,7 +2072,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" = xyes]) |
72 |
- AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes]) |
73 |
- AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes]) |
74 |
- AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes]) |
75 |
--AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes]) |
76 |
- AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes]) |
77 |
- AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes]) |
78 |
- AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes]) |
79 |
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h |
80 |
-index eea29dfb5..7144c6a27 100644 |
81 |
---- a/hw/xfree86/common/compiler.h |
82 |
-+++ b/hw/xfree86/common/compiler.h |
83 |
-@@ -986,33 +986,64 @@ inl(unsigned PORT_SIZE port) |
84 |
- #endif |
85 |
- |
86 |
- #ifdef __alpha__ |
87 |
--/* entry points for Mmio memory access routines */ |
88 |
--extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long); |
89 |
--extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long); |
90 |
--extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long); |
91 |
--extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long); |
92 |
--extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long); |
93 |
--extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long); |
94 |
-+static inline int |
95 |
-+xf86ReadMmio8(void *Base, unsigned long Offset) |
96 |
-+{ |
97 |
-+ mem_barrier(); |
98 |
-+ return *(CARD8 *) ((unsigned long) Base + (Offset)); |
99 |
-+} |
100 |
-+ |
101 |
-+static inline int |
102 |
-+xf86ReadMmio16(void *Base, unsigned long Offset) |
103 |
-+{ |
104 |
-+ mem_barrier(); |
105 |
-+ return *(CARD16 *) ((unsigned long) Base + (Offset)); |
106 |
-+} |
107 |
-+ |
108 |
-+static inline int |
109 |
-+xf86ReadMmio32(void *Base, unsigned long Offset) |
110 |
-+{ |
111 |
-+ mem_barrier(); |
112 |
-+ return *(CARD32 *) ((unsigned long) Base + (Offset)); |
113 |
-+} |
114 |
-+ |
115 |
-+static inline void |
116 |
-+xf86WriteMmio8(int Value, void *Base, unsigned long Offset) |
117 |
-+{ |
118 |
-+ write_mem_barrier(); |
119 |
-+ *(CARD8 *) ((unsigned long) Base + (Offset)) = Value; |
120 |
-+} |
121 |
-+ |
122 |
-+static inline void |
123 |
-+xf86WriteMmio16(int Value, void *Base, unsigned long Offset) |
124 |
-+{ |
125 |
-+ write_mem_barrier(); |
126 |
-+ *(CARD16 *) ((unsigned long) Base + (Offset)) = Value; |
127 |
-+} |
128 |
-+ |
129 |
-+static inline void |
130 |
-+xf86WriteMmio32(int Value, void *Base, unsigned long Offset) |
131 |
-+{ |
132 |
-+ write_mem_barrier(); |
133 |
-+ *(CARD32 *) ((unsigned long) Base + (Offset)) = Value; |
134 |
-+} |
135 |
-+ |
136 |
- extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, |
137 |
- int); |
138 |
- extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int); |
139 |
- |
140 |
- /* Some macros to hide the system dependencies for MMIO accesses */ |
141 |
- /* Changed to kill noise generated by gcc's -Wcast-align */ |
142 |
--#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset) |
143 |
--#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset) |
144 |
--#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset) |
145 |
-- |
146 |
--#define MMIO_OUT32(base, offset, val) \ |
147 |
-- do { \ |
148 |
-- write_mem_barrier(); \ |
149 |
-- *(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \ |
150 |
-- } while (0) |
151 |
-+#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset) |
152 |
-+#define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset) |
153 |
-+#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset) |
154 |
- |
155 |
- #define MMIO_OUT8(base, offset, val) \ |
156 |
-- (*xf86WriteMmio8)((CARD8)(val), base, offset) |
157 |
-+ xf86WriteMmio8((CARD8)(val), base, offset) |
158 |
- #define MMIO_OUT16(base, offset, val) \ |
159 |
-- (*xf86WriteMmio16)((CARD16)(val), base, offset) |
160 |
-+ xf86WriteMmio16((CARD16)(val), base, offset) |
161 |
-+#define MMIO_OUT32(base, offset, val) \ |
162 |
-+ xf86WriteMmio32((CARD32)(val), base, offset) |
163 |
- |
164 |
- #elif defined(__powerpc__) || defined(__sparc__) |
165 |
- /* |
166 |
-diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am |
167 |
-index b01ea5bca..66ac83805 100644 |
168 |
---- a/hw/xfree86/os-support/bsd/Makefile.am |
169 |
-+++ b/hw/xfree86/os-support/bsd/Makefile.am |
170 |
-@@ -26,8 +26,7 @@ endif |
171 |
- if ALPHA_VIDEO |
172 |
- # Cheat here and piggyback other alpha bits on ALPHA_VIDEO. |
173 |
- ARCH_SOURCES = \ |
174 |
-- alpha_video.c \ |
175 |
-- bsd_ev56.c |
176 |
-+ alpha_video.c |
177 |
- endif |
178 |
- |
179 |
- if ARM_VIDEO |
180 |
-diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am |
181 |
-index 26e40bb93..9b4535b53 100644 |
182 |
---- a/hw/xfree86/os-support/linux/Makefile.am |
183 |
-+++ b/hw/xfree86/os-support/linux/Makefile.am |
184 |
-@@ -1,13 +1,5 @@ |
185 |
- noinst_LTLIBRARIES = liblinux.la |
186 |
- |
187 |
--if LINUX_ALPHA |
188 |
--noinst_LTLIBRARIES += liblinuxev56.la |
189 |
-- |
190 |
--liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56 |
191 |
-- |
192 |
--liblinuxev56_la_SOURCES = lnx_ev56.c |
193 |
--endif |
194 |
-- |
195 |
- if LNXACPI |
196 |
- ACPI_SRCS = lnx_acpi.c |
197 |
- if !LNXAPM |
198 |
-@@ -39,7 +31,3 @@ liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \ |
199 |
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) |
200 |
- |
201 |
- AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) |
202 |
-- |
203 |
--if LINUX_ALPHA |
204 |
--liblinux_la_LIBADD = liblinuxev56.la |
205 |
--endif |
206 |
-diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c |
207 |
-index c09d71947..04e45092a 100644 |
208 |
---- a/hw/xfree86/os-support/linux/lnx_video.c |
209 |
-+++ b/hw/xfree86/os-support/linux/lnx_video.c |
210 |
-@@ -166,30 +166,3 @@ xf86DisableIO(void) |
211 |
- |
212 |
- ExtendedEnabled = FALSE; |
213 |
- } |
214 |
-- |
215 |
--#if defined (__alpha__) |
216 |
-- |
217 |
--extern int readDense8(void *Base, register unsigned long Offset); |
218 |
--extern int readDense16(void *Base, register unsigned long Offset); |
219 |
--extern int readDense32(void *Base, register unsigned long Offset); |
220 |
--extern void |
221 |
-- writeDense8(int Value, void *Base, register unsigned long Offset); |
222 |
--extern void |
223 |
-- writeDense16(int Value, void *Base, register unsigned long Offset); |
224 |
--extern void |
225 |
-- writeDense32(int Value, void *Base, register unsigned long Offset); |
226 |
-- |
227 |
--void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset) |
228 |
-- = writeDense8; |
229 |
--void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset) |
230 |
-- = writeDense16; |
231 |
--void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset) |
232 |
-- = writeDense32; |
233 |
--int (*xf86ReadMmio8) (void *Base, unsigned long Offset) |
234 |
-- = readDense8; |
235 |
--int (*xf86ReadMmio16) (void *Base, unsigned long Offset) |
236 |
-- = readDense16; |
237 |
--int (*xf86ReadMmio32) (void *Base, unsigned long Offset) |
238 |
-- = readDense32; |
239 |
-- |
240 |
--#endif /* __alpha__ */ |
241 |
-diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build |
242 |
-index 901422786..b6e5c975d 100644 |
243 |
---- a/hw/xfree86/os-support/meson.build |
244 |
-+++ b/hw/xfree86/os-support/meson.build |
245 |
-@@ -100,7 +100,6 @@ elif host_machine.system().endswith('bsd') |
246 |
- srcs_xorg_os_support += 'shared/ioperm_noop.c' |
247 |
- elif host_machine.cpu_family() == 'alpha' |
248 |
- srcs_xorg_os_support += 'bsd/alpha_video.c' |
249 |
-- srcs_xorg_os_support += 'bsd/bsd_ev56.c' |
250 |
- endif |
251 |
- |
252 |
- if host_machine.system() == 'freebsd' |
253 |
--- |
254 |
-2.16.1 |
255 |
- |
256 |
|
257 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.0.ebuild b/x11-base/xorg-server/xorg-server-1.20.0.ebuild |
258 |
deleted file mode 100644 |
259 |
index ec715ede7a2..00000000000 |
260 |
--- a/x11-base/xorg-server/xorg-server-1.20.0.ebuild |
261 |
+++ /dev/null |
262 |
@@ -1,221 +0,0 @@ |
263 |
-# Copyright 1999-2018 Gentoo Foundation |
264 |
-# Distributed under the terms of the GNU General Public License v2 |
265 |
- |
266 |
-EAPI=5 |
267 |
- |
268 |
-XORG_EAUTORECONF=yes |
269 |
-XORG_DOC=doc |
270 |
-inherit xorg-2 multilib versionator flag-o-matic |
271 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
272 |
- |
273 |
-DESCRIPTION="X.Org X servers" |
274 |
-SLOT="0/${PV}" |
275 |
-if [[ ${PV} != 9999* ]]; then |
276 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
277 |
-fi |
278 |
- |
279 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
280 |
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" |
281 |
- |
282 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
283 |
- !libressl? ( dev-libs/openssl:0= ) |
284 |
- libressl? ( dev-libs/libressl: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/libxkbfile-1.0.4 |
295 |
- >=x11-libs/libxshmfence-1.1 |
296 |
- >=x11-libs/pixman-0.27.2 |
297 |
- >=x11-libs/xtrans-1.3.5 |
298 |
- >=x11-misc/xbitmaps-1.0.1 |
299 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
300 |
- dmx? ( |
301 |
- x11-libs/libXt |
302 |
- >=x11-libs/libdmx-1.0.99.1 |
303 |
- >=x11-libs/libX11-1.1.5 |
304 |
- >=x11-libs/libXaw-1.0.4 |
305 |
- >=x11-libs/libXext-1.0.99.4 |
306 |
- >=x11-libs/libXfixes-5.0 |
307 |
- >=x11-libs/libXi-1.2.99.1 |
308 |
- >=x11-libs/libXmu-1.0.3 |
309 |
- x11-libs/libXrender |
310 |
- >=x11-libs/libXres-1.0.3 |
311 |
- >=x11-libs/libXtst-1.0.99.2 |
312 |
- ) |
313 |
- glamor? ( |
314 |
- media-libs/libepoxy[X] |
315 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
316 |
- !x11-libs/glamor |
317 |
- ) |
318 |
- kdrive? ( |
319 |
- >=x11-libs/libXext-1.0.5 |
320 |
- x11-libs/libXv |
321 |
- ) |
322 |
- xephyr? ( |
323 |
- x11-libs/libxcb[xkb] |
324 |
- x11-libs/xcb-util |
325 |
- x11-libs/xcb-util-image |
326 |
- x11-libs/xcb-util-keysyms |
327 |
- x11-libs/xcb-util-renderutil |
328 |
- x11-libs/xcb-util-wm |
329 |
- ) |
330 |
- !minimal? ( |
331 |
- >=x11-libs/libX11-1.1.5 |
332 |
- >=x11-libs/libXext-1.0.5 |
333 |
- >=media-libs/mesa-10.3.4-r1 |
334 |
- ) |
335 |
- udev? ( virtual/libudev:= ) |
336 |
- unwind? ( sys-libs/libunwind ) |
337 |
- wayland? ( |
338 |
- >=dev-libs/wayland-1.3.0 |
339 |
- media-libs/libepoxy |
340 |
- >=dev-libs/wayland-protocols-1.1 |
341 |
- ) |
342 |
- >=x11-apps/xinit-1.3.3-r1 |
343 |
- systemd? ( |
344 |
- sys-apps/dbus |
345 |
- sys-apps/systemd |
346 |
- )" |
347 |
- |
348 |
-DEPEND="${CDEPEND} |
349 |
- sys-devel/flex |
350 |
- >=x11-base/xorg-proto-2018.3 |
351 |
- dmx? ( |
352 |
- doc? ( |
353 |
- || ( |
354 |
- www-client/links |
355 |
- www-client/lynx |
356 |
- www-client/w3m |
357 |
- ) |
358 |
- ) |
359 |
- )" |
360 |
- |
361 |
-RDEPEND="${CDEPEND} |
362 |
- selinux? ( sec-policy/selinux-xserver ) |
363 |
- !x11-drivers/xf86-video-modesetting |
364 |
-" |
365 |
- |
366 |
-PDEPEND=" |
367 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
368 |
- |
369 |
-REQUIRED_USE="!minimal? ( |
370 |
- || ( ${IUSE_SERVERS} ) |
371 |
- ) |
372 |
- xephyr? ( kdrive )" |
373 |
- |
374 |
-UPSTREAMED_PATCHES=( |
375 |
- "${FILESDIR}"/${P}-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch |
376 |
-) |
377 |
- |
378 |
-PATCHES=( |
379 |
- "${UPSTREAMED_PATCHES[@]}" |
380 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
381 |
- # needed for new eselect-opengl, bug #541232 |
382 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
383 |
-) |
384 |
- |
385 |
-pkg_pretend() { |
386 |
- # older gcc is not supported |
387 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
388 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
389 |
-} |
390 |
- |
391 |
-pkg_setup() { |
392 |
- if use wayland && ! use glamor; then |
393 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
394 |
- ewarn "Performance may be unacceptable without it." |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-src_configure() { |
399 |
- # localstatedir is used for the log location; we need to override the default |
400 |
- # from ebuild.sh |
401 |
- # sysconfdir is used for the xorg.conf location; same applies |
402 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
403 |
- # package it somewhere |
404 |
- XORG_CONFIGURE_OPTIONS=( |
405 |
- $(use_enable ipv6) |
406 |
- $(use_enable debug) |
407 |
- $(use_enable dmx) |
408 |
- $(use_enable glamor) |
409 |
- $(use_enable kdrive) |
410 |
- $(use_enable unwind libunwind) |
411 |
- $(use_enable wayland xwayland) |
412 |
- $(use_enable !minimal record) |
413 |
- $(use_enable !minimal xfree86-utils) |
414 |
- $(use_enable !minimal dri) |
415 |
- $(use_enable !minimal dri2) |
416 |
- $(use_enable !minimal glx) |
417 |
- $(use_enable xcsecurity) |
418 |
- $(use_enable xephyr) |
419 |
- $(use_enable xnest) |
420 |
- $(use_enable xorg) |
421 |
- $(use_enable xvfb) |
422 |
- $(use_enable udev config-udev) |
423 |
- $(use_with doc doxygen) |
424 |
- $(use_with doc xmlto) |
425 |
- $(use_with systemd systemd-daemon) |
426 |
- $(use_enable systemd systemd-logind) |
427 |
- $(use_enable systemd suid-wrapper) |
428 |
- $(use_enable !systemd install-setuid) |
429 |
- --enable-libdrm |
430 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
431 |
- --localstatedir="${EPREFIX}"/var |
432 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
433 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
434 |
- --disable-config-hal |
435 |
- --disable-linux-acpi |
436 |
- --without-dtrace |
437 |
- --without-fop |
438 |
- --with-os-vendor=Gentoo |
439 |
- --with-sha1=libcrypto |
440 |
- ) |
441 |
- |
442 |
- xorg-2_src_configure |
443 |
-} |
444 |
- |
445 |
-src_install() { |
446 |
- xorg-2_src_install |
447 |
- |
448 |
- server_based_install |
449 |
- |
450 |
- if ! use minimal && use xorg; then |
451 |
- # Install xorg.conf.example into docs |
452 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
453 |
- fi |
454 |
- |
455 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
456 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
457 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
458 |
- |
459 |
- # install the @x11-module-rebuild set for Portage |
460 |
- insinto /usr/share/portage/config/sets |
461 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
462 |
-} |
463 |
- |
464 |
-pkg_postinst() { |
465 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
466 |
- eselect opengl set xorg-x11 --use-old |
467 |
-} |
468 |
- |
469 |
-pkg_postrm() { |
470 |
- # Get rid of module dir to ensure opengl-update works properly |
471 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
472 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
473 |
- fi |
474 |
-} |
475 |
- |
476 |
-server_based_install() { |
477 |
- if ! use xorg; then |
478 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
479 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
480 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
481 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
482 |
- fi |
483 |
-} |