commit: 21ad5b670f0f76feb708ca105e5e576e875e1bae
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 01:02:53 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 01:02:53 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=21ad5b67
x11-base/xorg-server: in tree version 21.1.3-r3 works
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
x11-base/xorg-server/Manifest | 1 -
x11-base/xorg-server/files/xdm-setup.initd-1 | 13 --
x11-base/xorg-server/files/xdm.confd-4 | 10 -
x11-base/xorg-server/files/xdm.initd-11 | 230 --------------------
.../files/xorg-server-1.12-unloadsubmodule.patch | 45 ----
...rver-1.18-support-multiple-Files-sections.patch | 71 -------
.../files/xorg-server-1.20.11-arm-musl.patch | 26 ---
.../xorg-server-1.20.11-fix-musl-input_event.patch | 58 -----
x11-base/xorg-server/files/xorg-sets.conf | 6 -
x11-base/xorg-server/metadata.xml | 22 --
x11-base/xorg-server/xorg-server-1.20.11.ebuild | 236 ---------------------
11 files changed, 718 deletions(-)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
deleted file mode 100644
index fad12568..00000000
--- a/x11-base/xorg-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B
71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef
SHA512
1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1
b/x11-base/xorg-server/files/xdm-setup.initd-1
deleted file mode 100644
index a9748a83..00000000
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
-}
-
-start() {
- if get_bootparam "nox" ; then
- touch /etc/.noxdm
- fi
-}
diff --git a/x11-base/xorg-server/files/xdm.confd-4
b/x11-base/xorg-server/files/xdm.confd-4
deleted file mode 100644
index 880d4635..00000000
--- a/x11-base/xorg-server/files/xdm.confd-4
+++ /dev/null
@@ -1,10 +0,0 @@
-# We always try and start X on a static VT. The various DMs normally default
-# to using VT7. If you wish to use the xdm init script, then you should ensure
-# that the VT checked is the same VT your DM wants to use. We do this check to
-# ensure that you haven't accidentally configured something to run on the VT
-# in your /etc/inittab file so that you don't get a dead keyboard.
-CHECKVT=7
-
-# What display manager do you use ? [ xdm | gdm | sddm | gpe | lightdm |
entrance ]
-# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-DISPLAYMANAGER="xdm"
diff --git a/x11-base/xorg-server/files/xdm.initd-11
b/x11-base/xorg-server/files/xdm.initd-11
deleted file mode 100644
index 34b22be5..00000000
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ /dev/null
@@ -1,230 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem: if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2. When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-# x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel. Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
- need localmount xdm-setup
-
- # this should start as early as possible
- # we can't do 'before *' as that breaks it
- # (#139824) Start after ypbind and autofs for network authentication
- # (#145219 #180163) Could use lirc mouse as input device
- # (#70689 comment #92) Start after consolefont to avoid display
corruption
- # (#291269) Start after quota, since some dm need readable home
- # (#390609) gdm-3 will fail when dbus is not running
- # (#366753) starting keymaps after X causes problems
- after bootmisc consolefont modules netmount
- after readahead-list ypbind autofs openvpn gpm lircmd
- after quota keymaps
- before alsasound
-
- # Start before X
- use consolekit dbus xfs
-}
-
-setup_dm() {
- local MY_XDM
-
- MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
-
- # Load our root path from profile.env
- # Needed for kdm
- PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
-
- NAME=
- case "${MY_XDM}" in
- kdm|kde)
- EXE=/usr/bin/kdm
- PIDFILE=/run/kdm.pid
- ;;
- entrance*)
- EXE=/usr/sbin/entrance
- PIDFILE=/run/entrance.pid
- ;;
- gdm|gnome)
- # gdm-3 and above has different paths
- if [ -f /usr/sbin/gdm ]; then
- EXE=/usr/sbin/gdm
- PIDFILE=/run/gdm/gdm.pid
- START_STOP_ARGS="--background"
- AUTOCLEAN_CGROUP="yes"
- else
- EXE=/usr/bin/gdm
- PIDFILE=/run/gdm.pid
- fi
- [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
- ;;
- wdm)
- EXE=/usr/bin/wdm
- PIDFILE=
- ;;
- gpe)
- EXE=/usr/bin/gpe-dm
- PIDFILE=/run/gpe-dm.pid
- ;;
- lxdm)
- EXE=/usr/sbin/lxdm-binary
- PIDFILE=/run/lxdm.pid
- START_STOP_ARGS="--background"
- ;;
- lightdm)
- EXE=/usr/sbin/lightdm
- PIDFILE=/run/lightdm.pid
- START_STOP_ARGS="--background"
- ;;
- sddm)
- EXE="/usr/bin/sddm"
- START_STOP_ARGS="-m --background"
- PIDFILE=/run/sddm.pid
- ;;
- *)
- # first find out if there is such executable
- EXE="$(command -v ${MY_XDM} 2>/dev/null)"
- PIDFILE="/run/${MY_XDM}.pid"
-
- # warn user that he is doing sick things if the exe was
not found
- if [ -z "${EXE}" ]; then
- echo "ERROR: Your XDM value is invalid."
- echo " No ${MY_XDM} executable could be found
on your system."
- fi
- ;;
- esac
-
- if ! [ -x "${EXE}" ]; then
- EXE=/usr/bin/xdm
- PIDFILE=/run/xdm.pid
- if ! [ -x "/usr/bin/xdm" ]; then
- echo "ERROR: Please set your DISPLAYMANAGER variable in
/etc/conf.d/xdm,"
- echo " or install x11-apps/xdm package"
- eend 255
- fi
- fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
- if [ -e /etc/inittab ] ; then
- grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
- elif [ -e /etc/ttys ] ; then
- grep -q "^ttyv$(($1 - 1))" /etc/ttys
- else
- return 1
- fi
-}
-
-start() {
- local EXE NAME PIDFILE AUTOCLEAN_CGROUP
- setup_dm
-
- if [ -f /etc/.noxdm ]; then
- einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\"
bootparam passed."
- rm /etc/.noxdm
- return 0
- fi
-
- ebegin "Setting up ${EXE##*/}"
-
- # save the prefered DM
- save_options "service" "${EXE}"
- save_options "name" "${NAME}"
- save_options "pidfile" "${PIDFILE}"
- save_options "start_stop_args" "${START_STOP_ARGS}"
- save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
-
- if [ -n "${CHECKVT-y}" ] ; then
- if vtstatic "${CHECKVT:-7}" ; then
- if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ]
&& [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
- ewarn "Something is already defined on VT
${CHECKVT:-7}, will start X later"
- telinit a >/dev/null 2>&1
- return 0
- else
- eerror "Something is already defined on VT
${CHECKVT:-7}, not starting"
- return 1
- fi
- fi
- fi
-
- /etc/X11/startDM.sh
- eend 0
-}
-
-stop() {
- local curvt retval
-
- retval=0
- if [ -t 0 ]; then
- if type fgconsole >/dev/null 2>&1; then
- curvt=$(fgconsole 2>/dev/null)
- else
- curvt=$(tty)
- case "${curvt}" in
- /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
- *) curvt= ;;
- esac
- fi
- fi
- local myexe myname mypidfile myservice
- myexe=$(get_options "service")
- myname=$(get_options "name")
- mypidfile=$(get_options "pidfile")
- myservice=${myexe##*/}
- yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options
"autoclean_cgroup")
-
- [ -z "${myexe}" ] && return 0
-
- ebegin "Stopping ${myservice}"
-
- if start-stop-daemon --quiet --test --stop --exec "${myexe}"
2>/dev/null; then
- start-stop-daemon --stop --exec "${myexe}" --retry
TERM/5/TERM/5 \
- ${mypidfile:+--pidfile} ${mypidfile} \
- ${myname:+--name} ${myname}
- retval=${?}
- fi
-
- # switch back to original vt
- if [ -n "${curvt}" ]; then
- if type chvt >/dev/null 2>&1; then
- chvt "${curvt}"
- else
- vidcontrol -s "$((curvt + 1))"
- fi
- fi
-
- eend ${retval} "Error stopping ${myservice}"
- return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
deleted file mode 100644
index ab08df71..00000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4d5c555b05cf09e186cab9411aea3155018dab59 Mon Sep 17 00:00:00 2001
-From:
-Date: Fri, 30 Apr 2021 22:50:01 -0500
-Subject: [PATCH 1/4]
-
----
- hw/xfree86/loader/loadmod.c | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
-index a6356bd..a2130a0 100644
---- a/hw/xfree86/loader/loadmod.c
-+++ b/hw/xfree86/loader/loadmod.c
-@@ -892,19 +892,18 @@ RemoveChild(ModuleDescPtr child)
- parent = child->parent;
- if (parent->child == child) {
- parent->child = child->sib;
-- return;
- }
--
-- prevsib = parent->child;
-- mdp = prevsib->sib;
-- while (mdp && mdp != child) {
-- prevsib = mdp;
-- mdp = mdp->sib;
-+ else {
-+ prevsib = parent->child;
-+ mdp = prevsib->sib;
-+ while (mdp && mdp != child) {
-+ prevsib = mdp;
-+ mdp = mdp->sib;
-+ }
-+ if (mdp == child)
-+ prevsib->sib = child->sib;
- }
-- if (mdp == child)
-- prevsib->sib = child->sib;
- child->sib = NULL;
-- return;
- }
-
- void
---
-2.26.3
-
diff --git
a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
deleted file mode 100644
index 3a58d716..00000000
---
a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 8fd90ff40ab7c59c7f0a6430737fbb31d0214e44 Mon Sep 17 00:00:00 2001
-From: Michał Górny <mgorny at gentoo.org>
-Date: Fri, 30 Apr 2021 22:51:14 -0500
-Subject: [PATCH 2/4] Support reading multiple 'Files' sections in
- configuration, concatenating the resulting paths. This makes it possible to
- add ModulePaths and FontPaths within xorg.conf.d/ files without interfering
- with user-provided xorg.conf. Gentoo needs this to support using replacement
- xorg modules provided by proprietary video drivers.
-
-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88003
-Signed-off-by: Michał Górny <mgorny at gentoo.org>
----
- hw/xfree86/parser/Files.c | 8 ++++++--
- hw/xfree86/parser/configProcs.h | 2 +-
- hw/xfree86/parser/read.c | 2 +-
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
-index c86ac7a..cad11cc 100644
---- a/hw/xfree86/parser/Files.c
-+++ b/hw/xfree86/parser/Files.c
-@@ -76,14 +76,18 @@ static const xf86ConfigSymTabRec FilesTab[] = {
- #define CLEANUP xf86freeFiles
-
- XF86ConfFilesPtr
--xf86parseFilesSection(void)
-+xf86parseFilesSection(XF86ConfFilesPtr ptr)
- {
- int i, j;
- int k, l;
- char *str;
- int token;
-
-- parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)
-+ if (!ptr) {
-+ if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) {
-+ return NULL;
-+ }
-+ }
-
- while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
- switch (token) {
-diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
-index 7a46e01..0eccd14 100644
---- a/hw/xfree86/parser/configProcs.h
-+++ b/hw/xfree86/parser/configProcs.h
-@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr);
- int xf86validateDevice(XF86ConfigPtr p);
-
- /* Files.c */
--XF86ConfFilesPtr xf86parseFilesSection(void);
-+XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr);
- void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr);
- void xf86freeFiles(XF86ConfFilesPtr p);
-
-diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
-index d7e7312..f8f5ed5 100644
---- a/hw/xfree86/parser/read.c
-+++ b/hw/xfree86/parser/read.c
-@@ -111,7 +111,7 @@ xf86readConfigFile(void)
- if (xf86nameCompare(xf86_lex_val.str, "files") == 0) {
- free(xf86_lex_val.str);
- xf86_lex_val.str = NULL;
-- HANDLE_RETURN(conf_files, xf86parseFilesSection());
-+ HANDLE_RETURN(conf_files,
xf86parseFilesSection(ptr->conf_files));
- }
- else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) {
- free(xf86_lex_val.str);
---
-2.26.3
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
b/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
deleted file mode 100644
index 4663cc58..00000000
--- a/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6a4a8b4fc167541bb2ed7911d1b22fc726ca3bf1 Mon Sep 17 00:00:00 2001
-From:
-Date: Fri, 30 Apr 2021 22:55:18 -0500
-Subject: [PATCH 4/4] convert to checking GLIBC instead of linux for arm musl
- users
-
----
- hw/xfree86/common/compiler.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 2b2008b..ddda5bf 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -518,7 +518,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned
long offset,
- barrier();
- }
-
--#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-+#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__))
- #if defined(__arm32__) || defined(__mips64)
- #define PORT_SIZE long
- #else
---
-2.26.3
-
diff --git
a/x11-base/xorg-server/files/xorg-server-1.20.11-fix-musl-input_event.patch
b/x11-base/xorg-server/files/xorg-server-1.20.11-fix-musl-input_event.patch
deleted file mode 100644
index cd79b67d..00000000
--- a/x11-base/xorg-server/files/xorg-server-1.20.11-fix-musl-input_event.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d8f70ec853fcd43199ca4887f75acc8a544084ce Mon Sep 17 00:00:00 2001
-From:
-Date: Fri, 30 Apr 2021 22:53:16 -0500
-Subject: [PATCH 3/4] Gracefully handle transition to 64 bit time with
- musl-1.2.1
-
----
- hw/dmx/examples/ev.c | 9 +++++----
- hw/dmx/input/usb-keyboard.c | 4 ++--
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/hw/dmx/examples/ev.c b/hw/dmx/examples/ev.c
-index 09e703c..692c2ef 100644
---- a/hw/dmx/examples/ev.c
-+++ b/hw/dmx/examples/ev.c
-@@ -114,8 +114,8 @@ main(int argc, char **argv)
- if ((fd = open(name, O_RDWR, 0)) >= 0) {
- printf("%s: open, fd = %d\n", name, fd);
- for (i = 0; i < LED_MAX; i++) {
-- event.time.tv_sec = time(0);
-- event.time.tv_usec = 0;
-+ event.input_event_sec = time(0);
-+ event.input_event_usec = 0;
- event.type = EV_LED;
- event.code = i;
- event.value = 0;
-@@ -123,10 +123,11 @@ main(int argc, char **argv)
- }
-
- while ((rc = read(fd, &event, sizeof(event))) > 0) {
-+ struct timeval t = {event.input_event_sec,
event.input_event_usec};
- printf("%-24.24s.%06lu type 0x%04x; code 0x%04x;"
- " value 0x%08x; ",
-- ctime(&event.time.tv_sec),
-- event.time.tv_usec, event.type, event.code,
event.value);
-+ ctime(&t.tv_sec),
-+ t.tv_usec, event.type, event.code, event.value);
- switch (event.type) {
- case EV_KEY:
- if (event.code > BTN_MISC) {
-diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c
-index b26c822..feac3d2 100644
---- a/hw/dmx/input/usb-keyboard.c
-+++ b/hw/dmx/input/usb-keyboard.c
-@@ -278,8 +278,8 @@ kbdUSBCtrl(DevicePtr pDev, KeybdCtrl * ctrl)
-
- gettimeofday(&tv, NULL);
- for (i = 0; i < 5; i++) {
-- event.time.tv_sec = tv.tv_sec;
-- event.time.tv_usec = tv.tv_usec;
-+ event.input_event_sec = tv.tv_sec;
-+ event.input_event_usec = tv.tv_usec;
- event.type = EV_LED;
- if (i == 0)
- led = 1; /* LED_CAPSL == 0x01 */
---
-2.26.3
-
diff --git a/x11-base/xorg-server/files/xorg-sets.conf
b/x11-base/xorg-server/files/xorg-sets.conf
deleted file mode 100644
index 5cd8112f..00000000
--- a/x11-base/xorg-server/files/xorg-sets.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
-[x11-module-rebuild]
-class = portage.sets.dbapi.VariableSet
-world-candidate = false
-variable = CATEGORY
-includes = x11-drivers
diff --git a/x11-base/xorg-server/metadata.xml
b/x11-base/xorg-server/metadata.xml
deleted file mode 100644
index 30e7cd9f..00000000
--- a/x11-base/xorg-server/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>x...@gentoo.org</email>
- <name>X11</name>
-</maintainer>
-<use>
- <flag name="dmx">Build the Distributed Multiheaded X server</flag>
- <flag name="elogind">Use elogind to get control over framebuffer when
running as regular user</flag>
- <flag name="kdrive">Build the kdrive X servers</flag>
- <flag name="unwind">Enable libunwind usage for backtraces</flag>
- <flag name="xcsecurity">Build Security extension</flag>
- <flag name="xephyr">Build the Xephyr server</flag>
- <flag name="xnest">Build the Xnest server</flag>
- <flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
- <flag name="xvfb">Build the Xvfb server</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
deleted file mode 100644
index d6079559..00000000
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2021 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 toolchain-funcs
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git";
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test
+udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- media-libs/libglvnd[X]
- dev-libs/openssl: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-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[pam]
- sys-auth/pambase[elogind]
- )
- !!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
- >=x11-base/xorg-proto-2018.4
- >=x11-libs/xtrans-1.3.5
- dmx? (
- doc? (
- || (
- www-client/links
- www-client/lynx
- www-client/w3m
- )
- )
- )
-"
-RDEPEND="${CDEPEND}
- !systemd? ( gui-libs/display-manager-init )
- selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
- sys-devel/flex
- wayland? ( dev-util/wayland-scanner )
-"
-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 test unit-tests)
- $(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
- CPP="$(tc-getPROG CPP cpp)"
- )
-
- 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_prepare() {
- default
-
- if use elibc_musl ; then
- eapply
"${FILESDIR}"/xorg-server-1.20.11-fix-musl-input_event.patch
- eapply "${FILESDIR}"/xorg-server-1.20.11-arm-musl.patch
- fi
-
- eapply_user
-}
-
-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
-
- # 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_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
-}
