commit: d4da40d328f432a363638a2e520cfbf84b06c7e0 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Jun 24 19:57:25 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Jun 24 20:13:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4da40d3
x11-base/xorg-server: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-base/xorg-server/Manifest | 1 - ...erver-1.20.7-Fix-building-with-fno-common.patch | 254 --------------------- x11-base/xorg-server/xorg-server-1.20.7.ebuild | 236 ------------------- 3 files changed, 491 deletions(-) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 7c6689fd4eb..0b04317f8a0 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,2 +1 @@ -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 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 d3011fcb255..00000000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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 <X11/extensions/xf86vmproto.h> --_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 ded98b6f8b9..00000000000 --- 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 -}
