From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- x11-base/xorg-server/Manifest | 8 +- ...erver-1.20.7-Fix-building-with-fno-common.patch | 254 --------------------- x11-base/xorg-server/xorg-server-1.20.7.ebuild | 236 ------------------- x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild | 237 +++++++++++++++++++ x11-base/xorg-server/xorg-server-1.20.8.ebuild | 2 +- x11-base/xorg-server/xorg-server-9999.ebuild | 19 +- 6 files changed, 256 insertions(+), 500 deletions(-) delete mode 100644 x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch delete mode 100644 x11-base/xorg-server/xorg-server-1.20.7.ebuild create mode 100644 x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild (limited to 'x11-base/xorg-server') diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 2514ac973ddb..d3df35b081af 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -3,11 +3,9 @@ AUX xdm.confd-4 573 BLAKE2B 0c2a282acc851b95f925715c31915be469ef3758bbaa800d5fc5 AUX xdm.initd-11 6033 BLAKE2B 713aa81380124326f3dce3604c44e943578d37d0c83b60778b4e1ffd3d7eec3f84014fcbd221ba4bd2b9839989f8a1aa21e76dbc3612436e4a9b3091cbd7714e SHA512 f1174938e91c323174efedfc332097fc802a1261b882b7ac7b39a8251f7c70908e037335d4ae542652afe8162e1c0f0312ebbaebc8b7c4b036abd94d1d1f64bb AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 -AUX xorg-server-1.20.7-Fix-building-with-fno-common.patch 8302 BLAKE2B e37c79e8d14955328243ff61b38a85f809d840b8dca68cd1b7336cffd3bbd2c014b76fe6ed0000b1eb4090d51d917d0cd3e3aae6c3d6e385a062d147310d1de8 SHA512 028c9812a4e059f3feedeb5fbf47d43489bd670751ba893e51b732559d172c4762d0c6d0699113d4fe4a18bba2f579d1ea574ccd719366820c7ea1816fa584b9 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 -DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 -EBUILD xorg-server-1.20.7.ebuild 6032 BLAKE2B 60913a727294a25aa348f596f5972ceeb6664ddddd2c1ef71ad6d1ec72b66daec05e1720c1db1ed6f8bced458304f373fbc3a0c9d041cb19242a568e54f451bf SHA512 e00b1b1056a577534c05d45bce9c93924773ab7748f94cde57bdefcf7bc6671a640ffdd389edc128735a3e63cebabe947692464190bb8961f6bc423ef368bc16 -EBUILD xorg-server-1.20.8.ebuild 5737 BLAKE2B 0ed225a48df9bfec9e6fd0960d51394a61a917e357a78594dd3d6948cd7ab3fa623d024d6fcb4cfe85dabc6b8500bb4a6648130421a70a1c44522689e6a92155 SHA512 a0f6dee6e5f2a0fc4956649f1868597be5be1b18800ff34f10ad4412dc14503728b429ca191006de9b64a85a2a8f826e676f99a383ee7ad0b755ee08eb19dc29 -EBUILD xorg-server-9999.ebuild 5740 BLAKE2B 74acdd4654eb23b4deb59a6719065d1a2bb3dced48053f56feb52349be571d8169474e8bf1a7090d5d42c65d00376f25f1ace4bae796f7a895b692a37ebb713e SHA512 ea0b4720399c43bd219ff8819cb0e1b338695357f6f8eb6852189dea6894bdf9879d6f8c92053a8222b560281dc4403124c06bc86b91c022cd936df4217aa7f2 +EBUILD xorg-server-1.20.8-r1.ebuild 5811 BLAKE2B abf1dbfda5e29fb8117f875bfdc0462d93a9720eb1e81dbcd195e3f62539abfbcd7a07ee2ba50f0314b4ae25091b048bd19ff005650ee761d70bebe682031209 SHA512 456f9e7f0c90bdda43743bd51954cdd9c95c886d3aabf227dd2bb5367f9b96c35d21d15b3cb93d9a9724e5d8eab0c2b09ebed8fe2dc435b1a5e4f871cc315d3b +EBUILD xorg-server-1.20.8.ebuild 5735 BLAKE2B a2b0cb465f0f4f6f8de29dad64192a9bf94a39828167b68c690fe4589487314c60c5099c16f7aa5797bae912a3543b0c525962d06fe0e09a603e00d9d825356e SHA512 2e15a579b0791ff13f885915f62ef3d9dc5c3547103e95dbff6393369c0f8321f51d609255b0149fd2bbd99d610497aecb2b7686163fe0491e5e7167e4293e29 +EBUILD xorg-server-9999.ebuild 5808 BLAKE2B 3cd072b5853a72c7aa0b6b3e9c0294e6b5d8df75199d66b512cded99a002205d5e6d3e258ddfd52780f016a4af7103e6424053ce25a532535073dc4e0750d4e5 SHA512 8c1e986e785e77a3f2031d4d48c911697b31642c52cf176de251fbff7368b09b12e1e29327f8a5a453ec8ac255e3dc12df98d438f3b10677779e98b7f1402e1b MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198 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 deleted file mode 100644 index d3011fcb255e..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 1610ef1d6b5ba99da9d1a639f3b65b2e61514a7d Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Fri, 24 Jan 2020 12:49:44 +0100 -Subject: [PATCH xserver] Fix building with `-fno-common` - -* GCC 10 will switch the default to `-fno-common`. - https://gcc.gnu.org/PR85678 - -Bug: https://bugs.gentoo.org/705880 -Signed-off-by: Matt Turner ---- - hw/dmx/config/dmxconfig.c | 2 +- - hw/dmx/config/xdmxconfig.c | 2 +- - hw/dmx/glxProxy/glxext.c | 2 -- - hw/xwayland/xwayland.c | 2 +- - test/misc.c | 2 +- - test/xi1/protocol-xchangedevicecontrol.c | 2 +- - test/xi2/protocol-common.c | 2 ++ - test/xi2/protocol-common.h | 2 +- - test/xi2/protocol-xigetclientpointer.c | 2 +- - test/xi2/protocol-xigetselectedevents.c | 2 +- - test/xi2/protocol-xipassivegrabdevice.c | 2 +- - test/xi2/protocol-xiquerydevice.c | 2 +- - test/xi2/protocol-xiquerypointer.c | 2 +- - test/xi2/protocol-xiqueryversion.c | 2 +- - test/xi2/protocol-xiselectevents.c | 2 +- - test/xi2/protocol-xisetclientpointer.c | 2 +- - test/xi2/protocol-xiwarppointer.c | 2 +- - 17 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c -index c1a9e1cf3..85bc0dbe4 100644 ---- a/hw/dmx/config/dmxconfig.c -+++ b/hw/dmx/config/dmxconfig.c -@@ -72,7 +72,7 @@ typedef struct DMXConfigCmdStruct { - DMXConfigList *xinputs; - } DMXConfigCmd, *DMXConfigCmdPtr; - --DMXConfigEntryPtr dmxConfigEntry; -+extern DMXConfigEntryPtr dmxConfigEntry; - static DMXConfigCmd dmxConfigCmd; - - static int dmxDisplaysFromCommandLine; -diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c -index 49e4b5459..05d839688 100644 ---- a/hw/dmx/config/xdmxconfig.c -+++ b/hw/dmx/config/xdmxconfig.c -@@ -65,7 +65,7 @@ extern FILE *yyin; - #define DMX_CANVAS_WIDTH 400 - #define DMX_CANVAS_HEIGHT 500 - --DMXConfigEntryPtr dmxConfigEntry; -+extern DMXConfigEntryPtr dmxConfigEntry; - static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual; - static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay; - static int dmxConfigGrabbed, dmxConfigGrabbedFine; -diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c -index 49848bbff..ca9780f99 100644 ---- a/hw/dmx/glxProxy/glxext.c -+++ b/hw/dmx/glxProxy/glxext.c -@@ -47,8 +47,6 @@ - #include "extinit.h" - #include "glx_extinit.h" - --int noGlxExtension; -- - /* - ** Forward declarations. - */ -diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c -index feb1058b7..5fefa5923 100644 ---- a/hw/xwayland/xwayland.c -+++ b/hw/xwayland/xwayland.c -@@ -40,7 +40,7 @@ - - #ifdef XF86VIDMODE - #include --_X_EXPORT Bool noXFree86VidModeExtension; -+extern _X_EXPORT Bool noXFree86VidModeExtension; - #endif - - #ifdef XWL_HAS_GLAMOR -diff --git a/test/misc.c b/test/misc.c -index 3c669b677..f1f76cccd 100644 ---- a/test/misc.c -+++ b/test/misc.c -@@ -33,7 +33,7 @@ - - #include "tests-common.h" - --ScreenInfo screenInfo; -+extern ScreenInfo screenInfo; - - static void - dix_version_compare(void) -diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c -index 57a15c407..54f1f67cb 100644 ---- a/test/xi1/protocol-xchangedevicecontrol.c -+++ b/test/xi1/protocol-xchangedevicecontrol.c -@@ -37,7 +37,7 @@ - - #include "protocol-common.h" - --ClientRec client_window; -+extern ClientRec client_window; - static ClientRec client_request; - - static void -diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c -index 8cd85dd05..05dd3c4e7 100644 ---- a/test/xi2/protocol-common.c -+++ b/test/xi2/protocol-common.c -@@ -45,6 +45,8 @@ static ClientRec server_client; - - void *global_userdata; - -+void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata); -+ - int enable_GrabButton_wrap = 1; - int enable_XISetEventMask_wrap = 1; - -diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h -index 8490529ad..742ce348f 100644 ---- a/test/xi2/protocol-common.h -+++ b/test/xi2/protocol-common.h -@@ -99,7 +99,7 @@ extern void *global_userdata; - * The reply handler called from WriteToClient. Set this handler if you need - * to check the reply values. - */ --void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata); -+extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata); - - /** - * The default screen used for the windows. Initialized by init_simple(). -diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c -index 9c38bd720..244e8438f 100644 ---- a/test/xi2/protocol-xigetclientpointer.c -+++ b/test/xi2/protocol-xigetclientpointer.c -@@ -46,7 +46,7 @@ static struct { - int win; - } test_data; - --ClientRec client_window; -+extern ClientRec client_window; - static ClientRec client_request; - - static void -diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c -index 9a0fac5d4..b14100224 100644 ---- a/test/xi2/protocol-xigetselectedevents.c -+++ b/test/xi2/protocol-xigetselectedevents.c -@@ -60,7 +60,7 @@ static struct { - int mask_len; - } test_data; - --ClientRec client_window; -+extern ClientRec client_window; - - /* AddResource is called from XISetSEventMask, we don't need this */ - Bool -diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c -index c703a1ee8..142bcecb7 100644 ---- a/test/xi2/protocol-xipassivegrabdevice.c -+++ b/test/xi2/protocol-xipassivegrabdevice.c -@@ -41,7 +41,7 @@ - - #include "protocol-common.h" - --ClientRec client_window; -+extern ClientRec client_window; - static ClientRec client_request; - - #define N_MODS 7 -diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c -index a068038fd..6ee8a80fc 100644 ---- a/test/xi2/protocol-xiquerydevice.c -+++ b/test/xi2/protocol-xiquerydevice.c -@@ -54,7 +54,7 @@ struct test_data { - int num_devices_in_reply; - }; - --ClientRec client_window; -+extern ClientRec client_window; - - static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, - void *closure); -diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c -index ed75d7910..0f5a2b57a 100644 ---- a/test/xi2/protocol-xiquerypointer.c -+++ b/test/xi2/protocol-xiquerypointer.c -@@ -41,7 +41,7 @@ - - #include "protocol-common.h" - --ClientRec client_window; -+extern ClientRec client_window; - static ClientRec client_request; - static void reply_XIQueryPointer_data(ClientPtr client, int len, - char *data, void *closure); -diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c -index 3ce758faa..c7ddbfc10 100644 ---- a/test/xi2/protocol-xiqueryversion.c -+++ b/test/xi2/protocol-xiqueryversion.c -@@ -58,7 +58,7 @@ struct test_data { - int minor_expected; - }; - --ClientRec client_window; -+extern ClientRec client_window; - - static void - reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure) -diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c -index f136c23d0..06050ade7 100644 ---- a/test/xi2/protocol-xiselectevents.c -+++ b/test/xi2/protocol-xiselectevents.c -@@ -62,7 +62,7 @@ - - static unsigned char *data[4096 * 20]; /* the request data buffer */ - --ClientRec client_window; -+extern ClientRec client_window; - - int - __real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client, -diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c -index 6584bb9cc..ddc9f0000 100644 ---- a/test/xi2/protocol-xisetclientpointer.c -+++ b/test/xi2/protocol-xisetclientpointer.c -@@ -48,7 +48,7 @@ - - #include "protocol-common.h" - --ClientRec client_window; -+extern ClientRec client_window; - static ClientRec client_request; - - static void -diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c -index 8484d54e5..e5c2f31ea 100644 ---- a/test/xi2/protocol-xiwarppointer.c -+++ b/test/xi2/protocol-xiwarppointer.c -@@ -44,7 +44,7 @@ - static int expected_x = SPRITE_X; - static int expected_y = SPRITE_Y; - --ClientRec client_window; -+extern ClientRec client_window; - - /** - * This function overrides the one in the screen rec. --- -2.24.1 - diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild deleted file mode 100644 index ded98b6f8b90..000000000000 --- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -inherit xorg-3 multilib flag-o-matic -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" - -CDEPEND="libglvnd? ( - media-libs/libglvnd[X] - !app-eselect/eselect-opengl - !!x11-drivers/nvidia-drivers[-libglvnd(-)] - ) - !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libdrm-2.4.89 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont2-2.0.1 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - xephyr? ( - x11-libs/libxcb[xkb] - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-18[X(+),egl,gbm] - >=media-libs/libepoxy-1.5.4[X,egl(+)] - ) - udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - >=media-libs/libepoxy-1.5.4[egl(+)] - >=dev-libs/wayland-protocols-1.18 - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - ) - elogind? ( - sys-apps/dbus - sys-auth/elogind - sys-auth/pambase[elogind] - ) - " - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-base/xorg-proto-2018.4 - dmx? ( - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - )" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) -" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd ) - minimal? ( !wayland ) - xephyr? ( kdrive )" - -UPSTREAMED_PATCHES=( - "${FILESDIR}"/${P}-Fix-building-with-fno-common.patch -) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch -) - -pkg_setup() { - if use wayland && use minimal; then - ewarn "glamor is necessary for acceleration under Xwayland." - ewarn "Performance may be unacceptable without it." - ewarn "Build with USE=-minimal to enable glamor." - fi - - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating; and I have no idea if Gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable debug) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal dri3) - $(use_enable !minimal glamor) - $(use_enable !minimal glx) - $(use_enable xcsecurity) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind') - $(use_with systemd systemd-daemon) - $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') - $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid') - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - ) -} - -src_configure() { - # Needed since commit 2a1a96d956f4 ("glamor: Add a function to get the - # driver name via EGL_MESA_query_driver") neglected to add autotools - # support - append-cflags -DGLAMOR_HAS_EGL_QUERY_DRIVER - - xorg-3_src_configure -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf - - find "${ED}"/var -type d -empty -delete || die -} - -pkg_postinst() { - if ! use minimal; then - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - if ! use libglvnd; then - eselect opengl set xorg-x11 --use-old - fi - fi -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} - -server_based_install() { - if ! use xorg; then - rm "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x - fi -} diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild new file mode 100644 index 000000000000..8aae610d6d0e --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +inherit xorg-3 multilib flag-o-matic +EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" + +CDEPEND="libglvnd? ( + media-libs/libglvnd[X] + !app-eselect/eselect-opengl + !!x11-drivers/nvidia-drivers[-libglvnd(-)] + ) + !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.89 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-18[X(+),egl,gbm] + >=media-libs/libepoxy-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + >=media-libs/libepoxy-1.5.4[egl(+)] + >=dev-libs/wayland-protocols-1.18 + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind + sys-auth/pambase[elogind] + ) + " + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-base/xorg-proto-2018.4 + dmx? ( + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd ) + minimal? ( !wayland ) + xephyr? ( kdrive )" + +UPSTREAMED_PATCHES=( +) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch +) + +pkg_setup() { + if use wayland && use minimal; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + ewarn "Build with USE=-minimal to enable glamor." + fi + + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal dri3) + $(use_enable !minimal glamor) + $(use_enable !minimal glx) + $(use_enable xcsecurity) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + if use systemd || use elogind; then + XORG_CONFIGURE_OPTIONS+=( + "--enable-systemd-logind" + "--disable-install-setuid" + "$(use_enable suid suid-wrapper)" + ) + else + XORG_CONFIGURE_OPTIONS+=( + "--disable-systemd-logind" + "--disable-suid-wrapper" + "$(use_enable suid install-setuid)" + ) + fi +} + +src_install() { + xorg-3_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${S}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf + + find "${ED}"/var -type d -empty -delete || die +} + +pkg_postinst() { + if ! use minimal; then + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + if ! use libglvnd; then + eselect opengl set xorg-x11 --use-old + fi + fi +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} diff --git a/x11-base/xorg-server/xorg-server-1.20.8.ebuild b/x11-base/xorg-server/xorg-server-1.20.8.ebuild index 8640edc77379..62120a5bcb2e 100644 --- a/x11-base/xorg-server/xorg-server-1.20.8.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.8.ebuild @@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 252ce275e869..347f504c887c 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" CDEPEND="libglvnd? ( media-libs/libglvnd[X] @@ -162,10 +162,7 @@ pkg_setup() { $(use_enable udev config-udev) $(use_with doc doxygen) $(use_with doc xmlto) - $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind') $(use_with systemd systemd-daemon) - $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') - $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid') --enable-libdrm --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var @@ -177,6 +174,20 @@ pkg_setup() { --without-fop --with-sha1=libcrypto ) + + if use systemd || use elogind; then + XORG_CONFIGURE_OPTIONS+=( + "--enable-systemd-logind" + "--disable-install-setuid" + "$(use_enable suid suid-wrapper)" + ) + else + XORG_CONFIGURE_OPTIONS+=( + "--disable-systemd-logind" + "--disable-suid-wrapper" + "$(use_enable suid install-setuid)" + ) + fi } src_install() { -- cgit v1.2.3