| 1 |
commit: d4da40d328f432a363638a2e520cfbf84b06c7e0 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 24 19:57:25 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 24 20:13:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4da40d3 |
| 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 |
...erver-1.20.7-Fix-building-with-fno-common.patch | 254 --------------------- |
| 14 |
x11-base/xorg-server/xorg-server-1.20.7.ebuild | 236 ------------------- |
| 15 |
3 files changed, 491 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 18 |
index 7c6689fd4eb..0b04317f8a0 100644 |
| 19 |
--- a/x11-base/xorg-server/Manifest |
| 20 |
+++ b/x11-base/xorg-server/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 |
| 23 |
DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 |
| 24 |
|
| 25 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch b/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch |
| 26 |
deleted file mode 100644 |
| 27 |
index d3011fcb255..00000000000 |
| 28 |
--- a/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,254 +0,0 @@ |
| 31 |
-From 1610ef1d6b5ba99da9d1a639f3b65b2e61514a7d Mon Sep 17 00:00:00 2001 |
| 32 |
-From: David Seifert <soap@g.o> |
| 33 |
-Date: Fri, 24 Jan 2020 12:49:44 +0100 |
| 34 |
-Subject: [PATCH xserver] Fix building with `-fno-common` |
| 35 |
- |
| 36 |
-* GCC 10 will switch the default to `-fno-common`. |
| 37 |
- https://gcc.gnu.org/PR85678 |
| 38 |
- |
| 39 |
-Bug: https://bugs.gentoo.org/705880 |
| 40 |
-Signed-off-by: Matt Turner <mattst88@×××××.com> |
| 41 |
---- |
| 42 |
- hw/dmx/config/dmxconfig.c | 2 +- |
| 43 |
- hw/dmx/config/xdmxconfig.c | 2 +- |
| 44 |
- hw/dmx/glxProxy/glxext.c | 2 -- |
| 45 |
- hw/xwayland/xwayland.c | 2 +- |
| 46 |
- test/misc.c | 2 +- |
| 47 |
- test/xi1/protocol-xchangedevicecontrol.c | 2 +- |
| 48 |
- test/xi2/protocol-common.c | 2 ++ |
| 49 |
- test/xi2/protocol-common.h | 2 +- |
| 50 |
- test/xi2/protocol-xigetclientpointer.c | 2 +- |
| 51 |
- test/xi2/protocol-xigetselectedevents.c | 2 +- |
| 52 |
- test/xi2/protocol-xipassivegrabdevice.c | 2 +- |
| 53 |
- test/xi2/protocol-xiquerydevice.c | 2 +- |
| 54 |
- test/xi2/protocol-xiquerypointer.c | 2 +- |
| 55 |
- test/xi2/protocol-xiqueryversion.c | 2 +- |
| 56 |
- test/xi2/protocol-xiselectevents.c | 2 +- |
| 57 |
- test/xi2/protocol-xisetclientpointer.c | 2 +- |
| 58 |
- test/xi2/protocol-xiwarppointer.c | 2 +- |
| 59 |
- 17 files changed, 17 insertions(+), 17 deletions(-) |
| 60 |
- |
| 61 |
-diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c |
| 62 |
-index c1a9e1cf3..85bc0dbe4 100644 |
| 63 |
---- a/hw/dmx/config/dmxconfig.c |
| 64 |
-+++ b/hw/dmx/config/dmxconfig.c |
| 65 |
-@@ -72,7 +72,7 @@ typedef struct DMXConfigCmdStruct { |
| 66 |
- DMXConfigList *xinputs; |
| 67 |
- } DMXConfigCmd, *DMXConfigCmdPtr; |
| 68 |
- |
| 69 |
--DMXConfigEntryPtr dmxConfigEntry; |
| 70 |
-+extern DMXConfigEntryPtr dmxConfigEntry; |
| 71 |
- static DMXConfigCmd dmxConfigCmd; |
| 72 |
- |
| 73 |
- static int dmxDisplaysFromCommandLine; |
| 74 |
-diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c |
| 75 |
-index 49e4b5459..05d839688 100644 |
| 76 |
---- a/hw/dmx/config/xdmxconfig.c |
| 77 |
-+++ b/hw/dmx/config/xdmxconfig.c |
| 78 |
-@@ -65,7 +65,7 @@ extern FILE *yyin; |
| 79 |
- #define DMX_CANVAS_WIDTH 400 |
| 80 |
- #define DMX_CANVAS_HEIGHT 500 |
| 81 |
- |
| 82 |
--DMXConfigEntryPtr dmxConfigEntry; |
| 83 |
-+extern DMXConfigEntryPtr dmxConfigEntry; |
| 84 |
- static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual; |
| 85 |
- static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay; |
| 86 |
- static int dmxConfigGrabbed, dmxConfigGrabbedFine; |
| 87 |
-diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c |
| 88 |
-index 49848bbff..ca9780f99 100644 |
| 89 |
---- a/hw/dmx/glxProxy/glxext.c |
| 90 |
-+++ b/hw/dmx/glxProxy/glxext.c |
| 91 |
-@@ -47,8 +47,6 @@ |
| 92 |
- #include "extinit.h" |
| 93 |
- #include "glx_extinit.h" |
| 94 |
- |
| 95 |
--int noGlxExtension; |
| 96 |
-- |
| 97 |
- /* |
| 98 |
- ** Forward declarations. |
| 99 |
- */ |
| 100 |
-diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c |
| 101 |
-index feb1058b7..5fefa5923 100644 |
| 102 |
---- a/hw/xwayland/xwayland.c |
| 103 |
-+++ b/hw/xwayland/xwayland.c |
| 104 |
-@@ -40,7 +40,7 @@ |
| 105 |
- |
| 106 |
- #ifdef XF86VIDMODE |
| 107 |
- #include <X11/extensions/xf86vmproto.h> |
| 108 |
--_X_EXPORT Bool noXFree86VidModeExtension; |
| 109 |
-+extern _X_EXPORT Bool noXFree86VidModeExtension; |
| 110 |
- #endif |
| 111 |
- |
| 112 |
- #ifdef XWL_HAS_GLAMOR |
| 113 |
-diff --git a/test/misc.c b/test/misc.c |
| 114 |
-index 3c669b677..f1f76cccd 100644 |
| 115 |
---- a/test/misc.c |
| 116 |
-+++ b/test/misc.c |
| 117 |
-@@ -33,7 +33,7 @@ |
| 118 |
- |
| 119 |
- #include "tests-common.h" |
| 120 |
- |
| 121 |
--ScreenInfo screenInfo; |
| 122 |
-+extern ScreenInfo screenInfo; |
| 123 |
- |
| 124 |
- static void |
| 125 |
- dix_version_compare(void) |
| 126 |
-diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c |
| 127 |
-index 57a15c407..54f1f67cb 100644 |
| 128 |
---- a/test/xi1/protocol-xchangedevicecontrol.c |
| 129 |
-+++ b/test/xi1/protocol-xchangedevicecontrol.c |
| 130 |
-@@ -37,7 +37,7 @@ |
| 131 |
- |
| 132 |
- #include "protocol-common.h" |
| 133 |
- |
| 134 |
--ClientRec client_window; |
| 135 |
-+extern ClientRec client_window; |
| 136 |
- static ClientRec client_request; |
| 137 |
- |
| 138 |
- static void |
| 139 |
-diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c |
| 140 |
-index 8cd85dd05..05dd3c4e7 100644 |
| 141 |
---- a/test/xi2/protocol-common.c |
| 142 |
-+++ b/test/xi2/protocol-common.c |
| 143 |
-@@ -45,6 +45,8 @@ static ClientRec server_client; |
| 144 |
- |
| 145 |
- void *global_userdata; |
| 146 |
- |
| 147 |
-+void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata); |
| 148 |
-+ |
| 149 |
- int enable_GrabButton_wrap = 1; |
| 150 |
- int enable_XISetEventMask_wrap = 1; |
| 151 |
- |
| 152 |
-diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h |
| 153 |
-index 8490529ad..742ce348f 100644 |
| 154 |
---- a/test/xi2/protocol-common.h |
| 155 |
-+++ b/test/xi2/protocol-common.h |
| 156 |
-@@ -99,7 +99,7 @@ extern void *global_userdata; |
| 157 |
- * The reply handler called from WriteToClient. Set this handler if you need |
| 158 |
- * to check the reply values. |
| 159 |
- */ |
| 160 |
--void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata); |
| 161 |
-+extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata); |
| 162 |
- |
| 163 |
- /** |
| 164 |
- * The default screen used for the windows. Initialized by init_simple(). |
| 165 |
-diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c |
| 166 |
-index 9c38bd720..244e8438f 100644 |
| 167 |
---- a/test/xi2/protocol-xigetclientpointer.c |
| 168 |
-+++ b/test/xi2/protocol-xigetclientpointer.c |
| 169 |
-@@ -46,7 +46,7 @@ static struct { |
| 170 |
- int win; |
| 171 |
- } test_data; |
| 172 |
- |
| 173 |
--ClientRec client_window; |
| 174 |
-+extern ClientRec client_window; |
| 175 |
- static ClientRec client_request; |
| 176 |
- |
| 177 |
- static void |
| 178 |
-diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c |
| 179 |
-index 9a0fac5d4..b14100224 100644 |
| 180 |
---- a/test/xi2/protocol-xigetselectedevents.c |
| 181 |
-+++ b/test/xi2/protocol-xigetselectedevents.c |
| 182 |
-@@ -60,7 +60,7 @@ static struct { |
| 183 |
- int mask_len; |
| 184 |
- } test_data; |
| 185 |
- |
| 186 |
--ClientRec client_window; |
| 187 |
-+extern ClientRec client_window; |
| 188 |
- |
| 189 |
- /* AddResource is called from XISetSEventMask, we don't need this */ |
| 190 |
- Bool |
| 191 |
-diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c |
| 192 |
-index c703a1ee8..142bcecb7 100644 |
| 193 |
---- a/test/xi2/protocol-xipassivegrabdevice.c |
| 194 |
-+++ b/test/xi2/protocol-xipassivegrabdevice.c |
| 195 |
-@@ -41,7 +41,7 @@ |
| 196 |
- |
| 197 |
- #include "protocol-common.h" |
| 198 |
- |
| 199 |
--ClientRec client_window; |
| 200 |
-+extern ClientRec client_window; |
| 201 |
- static ClientRec client_request; |
| 202 |
- |
| 203 |
- #define N_MODS 7 |
| 204 |
-diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c |
| 205 |
-index a068038fd..6ee8a80fc 100644 |
| 206 |
---- a/test/xi2/protocol-xiquerydevice.c |
| 207 |
-+++ b/test/xi2/protocol-xiquerydevice.c |
| 208 |
-@@ -54,7 +54,7 @@ struct test_data { |
| 209 |
- int num_devices_in_reply; |
| 210 |
- }; |
| 211 |
- |
| 212 |
--ClientRec client_window; |
| 213 |
-+extern ClientRec client_window; |
| 214 |
- |
| 215 |
- static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, |
| 216 |
- void *closure); |
| 217 |
-diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c |
| 218 |
-index ed75d7910..0f5a2b57a 100644 |
| 219 |
---- a/test/xi2/protocol-xiquerypointer.c |
| 220 |
-+++ b/test/xi2/protocol-xiquerypointer.c |
| 221 |
-@@ -41,7 +41,7 @@ |
| 222 |
- |
| 223 |
- #include "protocol-common.h" |
| 224 |
- |
| 225 |
--ClientRec client_window; |
| 226 |
-+extern ClientRec client_window; |
| 227 |
- static ClientRec client_request; |
| 228 |
- static void reply_XIQueryPointer_data(ClientPtr client, int len, |
| 229 |
- char *data, void *closure); |
| 230 |
-diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c |
| 231 |
-index 3ce758faa..c7ddbfc10 100644 |
| 232 |
---- a/test/xi2/protocol-xiqueryversion.c |
| 233 |
-+++ b/test/xi2/protocol-xiqueryversion.c |
| 234 |
-@@ -58,7 +58,7 @@ struct test_data { |
| 235 |
- int minor_expected; |
| 236 |
- }; |
| 237 |
- |
| 238 |
--ClientRec client_window; |
| 239 |
-+extern ClientRec client_window; |
| 240 |
- |
| 241 |
- static void |
| 242 |
- reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure) |
| 243 |
-diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c |
| 244 |
-index f136c23d0..06050ade7 100644 |
| 245 |
---- a/test/xi2/protocol-xiselectevents.c |
| 246 |
-+++ b/test/xi2/protocol-xiselectevents.c |
| 247 |
-@@ -62,7 +62,7 @@ |
| 248 |
- |
| 249 |
- static unsigned char *data[4096 * 20]; /* the request data buffer */ |
| 250 |
- |
| 251 |
--ClientRec client_window; |
| 252 |
-+extern ClientRec client_window; |
| 253 |
- |
| 254 |
- int |
| 255 |
- __real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client, |
| 256 |
-diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c |
| 257 |
-index 6584bb9cc..ddc9f0000 100644 |
| 258 |
---- a/test/xi2/protocol-xisetclientpointer.c |
| 259 |
-+++ b/test/xi2/protocol-xisetclientpointer.c |
| 260 |
-@@ -48,7 +48,7 @@ |
| 261 |
- |
| 262 |
- #include "protocol-common.h" |
| 263 |
- |
| 264 |
--ClientRec client_window; |
| 265 |
-+extern ClientRec client_window; |
| 266 |
- static ClientRec client_request; |
| 267 |
- |
| 268 |
- static void |
| 269 |
-diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c |
| 270 |
-index 8484d54e5..e5c2f31ea 100644 |
| 271 |
---- a/test/xi2/protocol-xiwarppointer.c |
| 272 |
-+++ b/test/xi2/protocol-xiwarppointer.c |
| 273 |
-@@ -44,7 +44,7 @@ |
| 274 |
- static int expected_x = SPRITE_X; |
| 275 |
- static int expected_y = SPRITE_Y; |
| 276 |
- |
| 277 |
--ClientRec client_window; |
| 278 |
-+extern ClientRec client_window; |
| 279 |
- |
| 280 |
- /** |
| 281 |
- * This function overrides the one in the screen rec. |
| 282 |
--- |
| 283 |
-2.24.1 |
| 284 |
- |
| 285 |
|
| 286 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild |
| 287 |
deleted file mode 100644 |
| 288 |
index ded98b6f8b9..00000000000 |
| 289 |
--- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild |
| 290 |
+++ /dev/null |
| 291 |
@@ -1,236 +0,0 @@ |
| 292 |
-# Copyright 1999-2020 Gentoo Authors |
| 293 |
-# Distributed under the terms of the GNU General Public License v2 |
| 294 |
- |
| 295 |
-EAPI=7 |
| 296 |
- |
| 297 |
-XORG_DOC=doc |
| 298 |
-inherit xorg-3 multilib flag-o-matic |
| 299 |
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 300 |
- |
| 301 |
-DESCRIPTION="X.Org X servers" |
| 302 |
-SLOT="0/${PV}" |
| 303 |
-if [[ ${PV} != 9999* ]]; then |
| 304 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" |
| 305 |
-fi |
| 306 |
- |
| 307 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 308 |
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" |
| 309 |
- |
| 310 |
-CDEPEND="libglvnd? ( |
| 311 |
- media-libs/libglvnd[X] |
| 312 |
- !app-eselect/eselect-opengl |
| 313 |
- !!x11-drivers/nvidia-drivers[-libglvnd(-)] |
| 314 |
- ) |
| 315 |
- !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) |
| 316 |
- !libressl? ( dev-libs/openssl:0= ) |
| 317 |
- libressl? ( dev-libs/libressl:0= ) |
| 318 |
- >=x11-apps/iceauth-1.0.2 |
| 319 |
- >=x11-apps/rgb-1.0.3 |
| 320 |
- >=x11-apps/xauth-1.0.3 |
| 321 |
- x11-apps/xkbcomp |
| 322 |
- >=x11-libs/libdrm-2.4.89 |
| 323 |
- >=x11-libs/libpciaccess-0.12.901 |
| 324 |
- >=x11-libs/libXau-1.0.4 |
| 325 |
- >=x11-libs/libXdmcp-1.0.2 |
| 326 |
- >=x11-libs/libXfont2-2.0.1 |
| 327 |
- >=x11-libs/libxkbfile-1.0.4 |
| 328 |
- >=x11-libs/libxshmfence-1.1 |
| 329 |
- >=x11-libs/pixman-0.27.2 |
| 330 |
- >=x11-libs/xtrans-1.3.5 |
| 331 |
- >=x11-misc/xbitmaps-1.0.1 |
| 332 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 333 |
- dmx? ( |
| 334 |
- x11-libs/libXt |
| 335 |
- >=x11-libs/libdmx-1.0.99.1 |
| 336 |
- >=x11-libs/libX11-1.1.5 |
| 337 |
- >=x11-libs/libXaw-1.0.4 |
| 338 |
- >=x11-libs/libXext-1.0.99.4 |
| 339 |
- >=x11-libs/libXfixes-5.0 |
| 340 |
- >=x11-libs/libXi-1.2.99.1 |
| 341 |
- >=x11-libs/libXmu-1.0.3 |
| 342 |
- x11-libs/libXrender |
| 343 |
- >=x11-libs/libXres-1.0.3 |
| 344 |
- >=x11-libs/libXtst-1.0.99.2 |
| 345 |
- ) |
| 346 |
- kdrive? ( |
| 347 |
- >=x11-libs/libXext-1.0.5 |
| 348 |
- x11-libs/libXv |
| 349 |
- ) |
| 350 |
- xephyr? ( |
| 351 |
- x11-libs/libxcb[xkb] |
| 352 |
- x11-libs/xcb-util |
| 353 |
- x11-libs/xcb-util-image |
| 354 |
- x11-libs/xcb-util-keysyms |
| 355 |
- x11-libs/xcb-util-renderutil |
| 356 |
- x11-libs/xcb-util-wm |
| 357 |
- ) |
| 358 |
- !minimal? ( |
| 359 |
- >=x11-libs/libX11-1.1.5 |
| 360 |
- >=x11-libs/libXext-1.0.5 |
| 361 |
- >=media-libs/mesa-18[X(+),egl,gbm] |
| 362 |
- >=media-libs/libepoxy-1.5.4[X,egl(+)] |
| 363 |
- ) |
| 364 |
- udev? ( virtual/libudev:= ) |
| 365 |
- unwind? ( sys-libs/libunwind ) |
| 366 |
- wayland? ( |
| 367 |
- >=dev-libs/wayland-1.3.0 |
| 368 |
- >=media-libs/libepoxy-1.5.4[egl(+)] |
| 369 |
- >=dev-libs/wayland-protocols-1.18 |
| 370 |
- ) |
| 371 |
- >=x11-apps/xinit-1.3.3-r1 |
| 372 |
- systemd? ( |
| 373 |
- sys-apps/dbus |
| 374 |
- sys-apps/systemd |
| 375 |
- ) |
| 376 |
- elogind? ( |
| 377 |
- sys-apps/dbus |
| 378 |
- sys-auth/elogind |
| 379 |
- sys-auth/pambase[elogind] |
| 380 |
- ) |
| 381 |
- " |
| 382 |
- |
| 383 |
-DEPEND="${CDEPEND} |
| 384 |
- sys-devel/flex |
| 385 |
- >=x11-base/xorg-proto-2018.4 |
| 386 |
- dmx? ( |
| 387 |
- doc? ( |
| 388 |
- || ( |
| 389 |
- www-client/links |
| 390 |
- www-client/lynx |
| 391 |
- www-client/w3m |
| 392 |
- ) |
| 393 |
- ) |
| 394 |
- )" |
| 395 |
- |
| 396 |
-RDEPEND="${CDEPEND} |
| 397 |
- selinux? ( sec-policy/selinux-xserver ) |
| 398 |
-" |
| 399 |
- |
| 400 |
-PDEPEND=" |
| 401 |
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
| 402 |
- |
| 403 |
-REQUIRED_USE="!minimal? ( |
| 404 |
- || ( ${IUSE_SERVERS} ) |
| 405 |
- ) |
| 406 |
- elogind? ( udev ) |
| 407 |
- ?? ( elogind systemd ) |
| 408 |
- minimal? ( !wayland ) |
| 409 |
- xephyr? ( kdrive )" |
| 410 |
- |
| 411 |
-UPSTREAMED_PATCHES=( |
| 412 |
- "${FILESDIR}"/${P}-Fix-building-with-fno-common.patch |
| 413 |
-) |
| 414 |
- |
| 415 |
-PATCHES=( |
| 416 |
- "${UPSTREAMED_PATCHES[@]}" |
| 417 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 418 |
- # needed for new eselect-opengl, bug #541232 |
| 419 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 420 |
-) |
| 421 |
- |
| 422 |
-pkg_setup() { |
| 423 |
- if use wayland && use minimal; then |
| 424 |
- ewarn "glamor is necessary for acceleration under Xwayland." |
| 425 |
- ewarn "Performance may be unacceptable without it." |
| 426 |
- ewarn "Build with USE=-minimal to enable glamor." |
| 427 |
- fi |
| 428 |
- |
| 429 |
- # localstatedir is used for the log location; we need to override the default |
| 430 |
- # from ebuild.sh |
| 431 |
- # sysconfdir is used for the xorg.conf location; same applies |
| 432 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
| 433 |
- # package it somewhere |
| 434 |
- XORG_CONFIGURE_OPTIONS=( |
| 435 |
- $(use_enable ipv6) |
| 436 |
- $(use_enable debug) |
| 437 |
- $(use_enable dmx) |
| 438 |
- $(use_enable kdrive) |
| 439 |
- $(use_enable unwind libunwind) |
| 440 |
- $(use_enable wayland xwayland) |
| 441 |
- $(use_enable !minimal record) |
| 442 |
- $(use_enable !minimal xfree86-utils) |
| 443 |
- $(use_enable !minimal dri) |
| 444 |
- $(use_enable !minimal dri2) |
| 445 |
- $(use_enable !minimal dri3) |
| 446 |
- $(use_enable !minimal glamor) |
| 447 |
- $(use_enable !minimal glx) |
| 448 |
- $(use_enable xcsecurity) |
| 449 |
- $(use_enable xephyr) |
| 450 |
- $(use_enable xnest) |
| 451 |
- $(use_enable xorg) |
| 452 |
- $(use_enable xvfb) |
| 453 |
- $(use_enable udev config-udev) |
| 454 |
- $(use_with doc doxygen) |
| 455 |
- $(use_with doc xmlto) |
| 456 |
- $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind') |
| 457 |
- $(use_with systemd systemd-daemon) |
| 458 |
- $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') |
| 459 |
- $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid') |
| 460 |
- --enable-libdrm |
| 461 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
| 462 |
- --localstatedir="${EPREFIX}"/var |
| 463 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
| 464 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
| 465 |
- --disable-config-hal |
| 466 |
- --disable-linux-acpi |
| 467 |
- --without-dtrace |
| 468 |
- --without-fop |
| 469 |
- --with-os-vendor=Gentoo |
| 470 |
- --with-sha1=libcrypto |
| 471 |
- ) |
| 472 |
-} |
| 473 |
- |
| 474 |
-src_configure() { |
| 475 |
- # Needed since commit 2a1a96d956f4 ("glamor: Add a function to get the |
| 476 |
- # driver name via EGL_MESA_query_driver") neglected to add autotools |
| 477 |
- # support |
| 478 |
- append-cflags -DGLAMOR_HAS_EGL_QUERY_DRIVER |
| 479 |
- |
| 480 |
- xorg-3_src_configure |
| 481 |
-} |
| 482 |
- |
| 483 |
-src_install() { |
| 484 |
- xorg-3_src_install |
| 485 |
- |
| 486 |
- server_based_install |
| 487 |
- |
| 488 |
- if ! use minimal && use xorg; then |
| 489 |
- # Install xorg.conf.example into docs |
| 490 |
- dodoc "${S}"/hw/xfree86/xorg.conf.example |
| 491 |
- fi |
| 492 |
- |
| 493 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 494 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
| 495 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 496 |
- |
| 497 |
- # install the @x11-module-rebuild set for Portage |
| 498 |
- insinto /usr/share/portage/config/sets |
| 499 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 500 |
- |
| 501 |
- find "${ED}"/var -type d -empty -delete || die |
| 502 |
-} |
| 503 |
- |
| 504 |
-pkg_postinst() { |
| 505 |
- if ! use minimal; then |
| 506 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
| 507 |
- if ! use libglvnd; then |
| 508 |
- eselect opengl set xorg-x11 --use-old |
| 509 |
- fi |
| 510 |
- fi |
| 511 |
-} |
| 512 |
- |
| 513 |
-pkg_postrm() { |
| 514 |
- # Get rid of module dir to ensure opengl-update works properly |
| 515 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 516 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 517 |
- fi |
| 518 |
-} |
| 519 |
- |
| 520 |
-server_based_install() { |
| 521 |
- if ! use xorg; then |
| 522 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 523 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 524 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 525 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
| 526 |
- fi |
| 527 |
-} |
Archives