[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2022-07-18 Thread Anthony G. Basile
commit: 21ad5b670f0f76feb708ca105e5e576e875e1bae
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Jul 19 01:02:53 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Jul 19 01:02:53 2022 +
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  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..
--- 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..
--- 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..
--- 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..
--- 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 

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2021-04-29 Thread Dave Hughes
commit: fb8397e1b09297f6255ae5d3867be60082317d3c
Author: Dave Hughes  gmail  com>
AuthorDate: Thu Apr 29 19:11:09 2021 +
Commit: Dave Hughes  gmail  com>
CommitDate: Thu Apr 29 19:11:09 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=fb8397e1

x11-base/xorg-server: sync with ::gentoo

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes  gmail.com>

 x11-base/xorg-server/Manifest  |   2 +-
 x11-base/xorg-server/files/xdm-setup.initd-1   |   3 +-
 x11-base/xorg-server/files/xdm.confd-4 |   2 +-
 x11-base/xorg-server/files/xdm.initd-11|   3 +-
 .../files/xorg-server-1.17.4-arm-musl.patch|  20 ---
 .../xorg-server-1.20.11.fix-musl-input_event.patch |  43 +
 ...ck-the-shm-dir-at-run-time-not-build-time.patch | 174 -
 ...1.20.4-shm-Use-memfd_create-when-possible.patch |  89 ---
 ...ndent-shm_tmpfile-to-follow-our-standards.patch |  72 -
 x11-base/xorg-server/metadata.xml  |   4 +-
 ...er-1.20.5.ebuild => xorg-server-1.20.11.ebuild} |  96 ++--
 11 files changed, 101 insertions(+), 407 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f978f86..fad1256 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 
2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be
 SHA512 
625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631
+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
index 917cd12..a9748a8 100644
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ b/x11-base/xorg-server/files/xdm-setup.initd-1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
need localmount

diff --git a/x11-base/xorg-server/files/xdm.confd-4 
b/x11-base/xorg-server/files/xdm.confd-4
index c82fece..880d463 100644
--- a/x11-base/xorg-server/files/xdm.confd-4
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -5,6 +5,6 @@
 # in your /etc/inittab file so that you don't get a dead keyboard.
 CHECKVT=7
 
-# What display manager do you use ?  [ xdm | gdm | kdm | gpe | entrance ]
+# 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
index ce76c56..34b22be 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
-# $Id$
 
 # This is here to serve as a note to myself, and future developers.
 #

diff --git a/x11-base/xorg-server/files/xorg-server-1.17.4-arm-musl.patch 
b/x11-base/xorg-server/files/xorg-server-1.17.4-arm-musl.patch
deleted file mode 100644
index e661ae1..000
--- a/x11-base/xorg-server/files/xorg-server-1.17.4-arm-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 ./hw/xfree86/common/compiler.h.orig
-+++ ./hw/xfree86/common/compiler.h
-@@ -721,7 +721,7 @@
-  :"r"(val), "r"(addr), "i"(ASI_PL));
- }
- 
--#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-+#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__))
- #if defined(__arm32__) || defined(__mips64)
- #define PORT_SIZE long
- #else
-@@ -996,7 +996,7 @@
- return xf86ReadMmio32Le((void *) ioBase, port);
- }
- 
--#elif defined(__arm__) && defined(__linux__)
-+#elif defined(__arm__) && defined(__GLIBC__)
- 
- /* for Linux on ARM, we use the LIBC inx/outx routines */
- /* note that the appropriate setup via "ioperm" needs to be done */

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
new file mode 100644
index 000..ec1ae8f
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch
@@ -0,0 +1,43 @@
+Source: @pullmoll
+Upstream: no
+Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
+
+--- hw/dmx/input/usb-keyboard.c

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2020-01-04 Thread Anthony G. Basile
commit: c6cdc79a4c4289d8212269ba51ea0c79434fff3b
Author: stefson  yahoo  de>
AuthorDate: Sat Jan  4 11:17:13 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan  4 15:58:27 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c6cdc79a

x11-base/xorg-server: bump to v1.20.6

Signed-off-by: Steffen Kuhn  yandex.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest  |   2 +-
 ...ck-the-shm-dir-at-run-time-not-build-time.patch | 174 -
 ...1.20.4-shm-Use-memfd_create-when-possible.patch |  89 ---
 ...ndent-shm_tmpfile-to-follow-our-standards.patch |  72 -
 ...ver-1.20.5.ebuild => xorg-server-1.20.6.ebuild} |  35 ++---
 5 files changed, 18 insertions(+), 354 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f978f86..6f02874 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 
2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be
 SHA512 
625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631
+DIST xorg-server-1.20.6.tar.bz2 6298697 BLAKE2B 
30e505cf83bb2b20e17533b89b81521d029412ea6bd804ecf20458af20364172eb7b21561f14c885d5e16597e6d09985b255b6cec2beb30662658d9e316bc953
 SHA512 
9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
 
b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
deleted file mode 100644
index 54ed629..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 19f6cb570becbc4e355807199c6e251fc7935132 Mon Sep 17 00:00:00 2001
-From: Eric Anholt 
-Date: Wed, 19 Sep 2018 13:28:06 -0700
-Subject: [PATCH xserver] shm: Pick the shm dir at run time, not build time.
-
-Prodding the builder's filesystem for tmp dirs doesn't necessarily
-tell you anything about what the actual host's filesystem is going to
-look like, so we should just try the dirs at runtime.
-
-Signed-off-by: Eric Anholt 

- Xext/shm.c  | 48 +
- configure.ac| 43 
- include/dix-config.h.in |  3 ---
- include/meson.build |  5 -
- 4 files changed, 29 insertions(+), 70 deletions(-)
-
-diff --git a/Xext/shm.c b/Xext/shm.c
-index ed43b9202..2739a59e7 100644
 a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -1194,36 +1194,46 @@ ProcShmAttachFd(ClientPtr client)
- static int
- shm_tmpfile(void)
- {
--#ifdef SHMDIR
-+const char *shmdirs[] = {
-+"/run/shm",
-+"/var/tmp",
-+"/tmp",
-+};
- int   fd;
--char  template[] = SHMDIR "/shmfd-XX";
-+
- #ifdef O_TMPFILE
--fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
--if (fd >= 0) {
--DebugF ("Using O_TMPFILE\n");
--return fd;
-+for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
-+fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
-+if (fd >= 0) {
-+DebugF ("Using O_TMPFILE\n");
-+return fd;
-+}
- }
- ErrorF ("Not using O_TMPFILE\n");
- #endif
-+
-+for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
-+char template[PATH_MAX];
-+snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XX", 
shmdirs[i]);
- #ifdef HAVE_MKOSTEMP
--fd = mkostemp(template, O_CLOEXEC);
-+fd = mkostemp(template, O_CLOEXEC);
- #else
--fd = mkstemp(template);
-+fd = mkstemp(template);
- #endif
--if (fd < 0)
--return -1;
--unlink(template);
-+if (fd < 0)
-+continue;
-+unlink(template);
- #ifndef HAVE_MKOSTEMP
--int flags = fcntl(fd, F_GETFD);
--if (flags != -1) {
--flags |= FD_CLOEXEC;
--(void) fcntl(fd, F_SETFD, );
--}
-+int flags = fcntl(fd, F_GETFD);
-+if (flags != -1) {
-+flags |= FD_CLOEXEC;
-+(void) fcntl(fd, F_SETFD, );
-+}
- #endif
--return fd;
--#else
-+return fd;
-+}
-+
- return -1;
--#endif
- }
- 
- static int
-diff --git a/configure.ac b/configure.ac
-index 359b62cb5..57a233102 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1115,49 +1115,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in
- esac
- AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
- 
--dnl
--dnl Locate a suitable tmp file system for creating shared memeory files
--dnl
--
--AC_ARG_WITH(shared-memory-dir, 
AS_HELP_STRING([--with-shared-memory-dir=PATH], [Path to directory in a 
world-writable temporary 

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2019-08-20 Thread Anthony G. Basile
commit: 7b09219f15e8a105248b7ac1c07d8ab239ada118
Author: stefson  yahoo  de>
AuthorDate: Tue Jul 30 04:48:14 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Aug 20 20:43:12 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b09219f

x11-base/xorg-server: revbump to 1.20.5

Signed-off-by: Steffen Kuhn  yahoo.de>
Signed-off-by: Anthony G. Basile  gentoo.org>

 x11-base/xorg-server/Manifest | 2 +-
 x11-base/xorg-server/files/xdm.initd-11   | 2 +-
 .../{xorg-server-1.20.4.ebuild => xorg-server-1.20.5.ebuild}  | 8 
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3dd24c9..f978f86 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 
224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d
 SHA512 
f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8
+DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 
2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be
 SHA512 
625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631

diff --git a/x11-base/xorg-server/files/xdm.initd-11 
b/x11-base/xorg-server/files/xdm.initd-11
index 70b81c0..ce76c56 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -208,7 +208,7 @@ stop() {
 
ebegin "Stopping ${myservice}"
 
-   if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+   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}

diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
similarity index 95%
rename from x11-base/xorg-server/xorg-server-1.20.4.ebuild
rename to x11-base/xorg-server/xorg-server-1.20.5.ebuild
index ec78441..dfc7110 100644
--- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
@@ -91,7 +91,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 
 DEPEND="${CDEPEND}
sys-devel/flex
-   >=x11-base/xorg-proto-2018.3
+   >=x11-base/xorg-proto-2018.4
dmx? (
doc? (
|| (
@@ -119,9 +119,9 @@ REQUIRED_USE="!minimal? (
xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
-   
"${FILESDIR}"/${P}-shm-reindent-shm_tmpfile-to-follow-our-standards.patch
-   "${FILESDIR}"/${P}-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
-   "${FILESDIR}"/${P}-shm-Use-memfd_create-when-possible.patch
+   
"${FILESDIR}"/${PN}-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch
+   
"${FILESDIR}"/${PN}-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch
+   "${FILESDIR}"/${PN}-1.20.4-shm-Use-memfd_create-when-possible.patch
 )
 
 PATCHES=(



[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-06-17 Thread Anthony G. Basile
commit: 9915647a65aa7787956b5982f63e5563dea36f1a
Author: stefson  yahoo  de>
AuthorDate: Sun Jun 17 09:05:35 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Jun 17 09:37:31 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9915647a

x11-base/xorg-server: remove proto deps

 x11-base/xorg-server/files/dep-list   | 29 ---
 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild | 33 ++---
 x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild | 35 +++
 3 files changed, 7 insertions(+), 90 deletions(-)

diff --git a/x11-base/xorg-server/files/dep-list 
b/x11-base/xorg-server/files/dep-list
deleted file mode 100644
index 3e064ba..000
--- a/x11-base/xorg-server/files/dep-list
+++ /dev/null
@@ -1,29 +0,0 @@
-=x11-base/xorg-server-1.19.99.901
-=x11-base/xorg-proto-2018.4
-=x11-proto/bigreqsproto-1.1.2-r1
-=x11-proto/compositeproto-0.4.2-r2
-=x11-proto/damageproto-1.2.1-r2
-=x11-proto/dri2proto-2.1.1-r2
-=x11-proto/dri3proto-1.0-r1
-=x11-proto/fixesproto-5.0-r2
-=x11-proto/fontsproto-2.1.3-r1
-=x11-proto/glproto-1.4.17-r2
-=x11-proto/inputproto-2.3.2-r1
-=x11-proto/kbproto-1.0.7-r1
-=x11-proto/presentproto-1.1-r1
-=x11-proto/randrproto-1.5.0-r1
-=x11-proto/recordproto-1.14.2-r2
-=x11-proto/renderproto-0.11.1-r2
-=x11-proto/resourceproto-1.2.0-r1
-=x11-proto/scrnsaverproto-1.2.2-r2
-=x11-proto/trapproto-3.4.3-r1
-=x11-proto/videoproto-2.3.3-r1
-=x11-proto/xcmiscproto-1.2.2-r1
-=x11-proto/xextproto-7.3.0-r1
-=x11-proto/xf86bigfontproto-1.2.0-r2
-=x11-proto/xf86dgaproto-2.1-r3
-=x11-proto/xf86driproto-2.1.1-r2
-=x11-proto/xf86vidmodeproto-2.3.1-r2
-=x11-proto/xineramaproto-1.2.1-r2
-=x11-proto/xproto-7.0.31-r1
-

diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
index c3cd8c9..cac9ce7 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal 
selinux +suid systemd
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl )
+   libressl? ( dev-libs/libressl:0= )
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.3
>=x11-apps/xauth-1.0.3
@@ -83,32 +83,8 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 
 DEPEND="${CDEPEND}
sys-devel/flex
-   >=x11-proto/bigreqsproto-1.1.0
-   >=x11-proto/compositeproto-0.4
-   >=x11-proto/damageproto-1.1
-   >=x11-proto/fixesproto-5.0
-   >=x11-proto/fontsproto-2.1.3
-   >=x11-proto/glproto-1.4.17-r1
-   >=x11-proto/inputproto-2.3
-   >=x11-proto/kbproto-1.0.3
-   >=x11-proto/randrproto-1.5.0
-   >=x11-proto/recordproto-1.13.99.1
-   >=x11-proto/renderproto-0.11
-   >=x11-proto/resourceproto-1.2.0
-   >=x11-proto/scrnsaverproto-1.1
-   >=x11-proto/trapproto-3.4.3
-   >=x11-proto/videoproto-2.2.2
-   >=x11-proto/xcmiscproto-1.2.0
-   >=x11-proto/xextproto-7.2.99.901
-   >=x11-proto/xf86dgaproto-2.0.99.1
-   >=x11-proto/xf86vidmodeproto-2.2.99.1
-   >=x11-proto/xineramaproto-1.1.3
-   >=x11-proto/xproto-7.0.31
-   >=x11-proto/presentproto-1.0
-   >=x11-proto/dri2proto-2.8
-   >=x11-proto/dri3proto-1.0
+   x11-base/xorg-proto
dmx? (
-   >=x11-proto/dmxproto-2.2.99.1
doc? (
|| (
www-client/links
@@ -116,9 +92,6 @@ DEPEND="${CDEPEND}
www-client/w3m
)
)
-   )
-   !minimal? (
-   >=x11-proto/xf86driproto-2.1.0
)"
 
 RDEPEND="${CDEPEND}

diff --git a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
index a56636b..db4071c 100644
--- a/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal 
selinux +suid systemd
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl )
+   libressl? ( dev-libs/libressl:0= )
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.3
>=x11-apps/xauth-1.0.3
@@ -83,32 +83,8 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 
 DEPEND="${CDEPEND}
sys-devel/flex
-   >=x11-proto/bigreqsproto-1.1.0
-   >=x11-proto/compositeproto-0.4
-   

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-06-16 Thread Anthony G. Basile
commit: 00a6fc548bb56a80bb71a4300c0f55cbd0dbc500
Author: stefson  yahoo  de>
AuthorDate: Sat Jun 16 11:33:47 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jun 16 23:10:57 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=00a6fc54

x11-base/xorg-server: revbump

 x11-base/xorg-server/Manifest  |   2 +-
 ...ine-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 ++
 x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild  | 251 -
 19.99.901.ebuild => xorg-server-1.20.0.ebuild} |  16 +-
 4 files changed, 234 insertions(+), 259 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 843e283..94db573 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,3 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 
7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6
 SHA512 
38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412
-DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 
5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670
 SHA512 
c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5
+DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde

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
new file mode 100644
index 000..ebf677a
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
@@ -0,0 +1,224 @@
+From eecedfffd40f0465d85347f14547ddc6b30e57df Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+Date: Tue, 22 May 2018 21:10:55 -0700
+Subject: [PATCH xserver] xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on
+ alpha
+
+In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we
+somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the
+function pointer indirection was intended to support dense vs sparse and
+sparse support is now gone, we can just make the functions static inline
+in compiler.h and avoid all of this.
+
+Bugzilla: https://bugs.gentoo.org/548906
+Tested-by: Christopher May-Townsend 
+Reviewed-by: Adam Jackson 
+Signed-off-by: Matt Turner 
+---
+ configure.ac|  4 --
+ hw/xfree86/common/compiler.h| 67 -
+ hw/xfree86/os-support/bsd/Makefile.am   |  3 +-
+ hw/xfree86/os-support/linux/Makefile.am | 12 --
+ hw/xfree86/os-support/linux/lnx_video.c | 27 -
+ hw/xfree86/os-support/meson.build   |  1 -
+ 6 files changed, 50 insertions(+), 64 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ddc47faa2..0075b6ace 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1908,9 +1908,6 @@ if test "x$XORG" = xyes; then
+   XORG_OS_SUBDIR="linux"
+   linux_acpi="no"
+   case $host_cpu in
+-alpha*)
+-  linux_alpha=yes
+-  ;;
+ i*86|amd64*|x86_64*|ia64*)
+   linux_acpi=$enable_linux_acpi
+   ;;
+@@ -2075,7 +2072,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
+ AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
+ AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
+ AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
+-AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
+ AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
+ AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])
+ AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index eea29dfb5..7144c6a27 100644
+--- a/hw/xfree86/common/compiler.h
 b/hw/xfree86/common/compiler.h
+@@ -986,33 +986,64 @@ inl(unsigned PORT_SIZE port)
+ #endif
+ 
+ #ifdef __alpha__
+-/* entry points for Mmio memory access routines */
+-extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long);

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-02-07 Thread Anthony G. Basile
commit: e1b6c26ad078a85dc8e15054169176c96406955f
Author: stefson  yahoo  de>
AuthorDate: Sun Feb  4 10:34:54 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Feb  7 12:19:22 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=e1b6c26a

x11-base/xorg-server: fix for #646390

 .../files/xorg-server-1.19.6-fix-NULL-value-detection.patch | 13 +
 x11-base/xorg-server/xorg-server-1.19.6.ebuild  |  2 ++
 2 files changed, 15 insertions(+)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
new file mode 100644
index 000..94c319a
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch
@@ -0,0 +1,13 @@
+diff --git a/config/udev.c b/config/udev.c
+index e198e8609..3a73189e2 100644
+--- a/config/udev.c
 b/config/udev.c
+@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
+ #endif
+ 
+ value = udev_device_get_property_value(udev_device, "ID_INPUT");
+-if (value && !strcmp(value, "0")) {
++if (!value || !strcmp(value, "0")) {
+ LogMessageVerb(X_INFO, 10,
+"config/udev: ignoring device %s without "
+"property ID_INPUT set\n", path);

diff --git a/x11-base/xorg-server/xorg-server-1.19.6.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
index 22e4152..6d816a8 100644
--- a/x11-base/xorg-server/xorg-server-1.19.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.6.ebuild
@@ -146,6 +146,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
"${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530
"${FILESDIR}"/${PN}-1.17.4-arm-musl.patch
+   # see https://bugs.gentoo.org/646390
+"${FILESDIR}"/${PN}-1.19.6-fix-NULL-value-detection.patch
 )
 
 pkg_pretend() {



[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2018-01-03 Thread Aric Belsito
commit: 83b7fa3ee934fc0377c4bbb5343de79fb1a0733a
Author: stefson  yahoo  de>
AuthorDate: Wed Jan  3 16:45:43 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Wed Jan  3 16:45:43 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=83b7fa3e

x11-base/xorg-server: revbump

 x11-base/xorg-server/Manifest  |  2 +-
 .../files/xorg-server-1.18-sysmacros.patch | 59 --
 .../files/xorg-server-1.19.4-sysmacros.patch   | 36 +
 ...ver-1.19.3.ebuild => xorg-server-1.19.5.ebuild} |  4 +-
 4 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2021b40..9b10279 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 
677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 
b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669
 WHIRLPOOL 
acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad74416e6be89575523285e1ca3954f9e60a5cf079
+DIST xorg-server-1.19.5.tar.bz2 5965044 SHA256 
18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 WHIRLPOOL 
01039d524a876ba6bd72713993b1d4d6e21f8ba53536ee3189dce9cc7186010e143754fa708d2ccf10905dd272bc68b14c63f4322548e041dfc23cf00e4c364e

diff --git a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch 
b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch
deleted file mode 100644
index 5a3dea3..000
--- a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= 
-Date: Sat, 16 Apr 2016 13:04:59 +0200
-Subject: [PATCH] Include sys/sysmacros.h for major(3)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GNU major(3) manual page prescribes , but that does not work with
-sys-libs/glibc-2.23-r1.
-
-https://bugs.gentoo.org/show_bug.cgi?id=580044
-Signed-off-by: Petr Písař 

- config/udev.c  | 1 +
- hw/xfree86/common/xf86Xinput.c | 2 ++
- hw/xfree86/os-support/linux/lnx_init.c | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/config/udev.c b/config/udev.c
-index 28c2658..62908f4 100644
 a/config/udev.c
-+++ b/config/udev.c
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "input.h"
- #include "inputstr.h"
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index c56a2b9..d33c165 100644
 a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -86,6 +86,8 @@
- #include 
- #ifdef HAVE_SYS_MKDEV_H
- #include   /* for major() & minor() on Solaris */
-+#else
-+#include 
- #endif
- 
- #include "mi.h"
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c 
b/hw/xfree86/os-support/linux/lnx_init.c
-index 1ed213c..6caf531 100644
 a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -38,6 +38,7 @@
- #include "xf86_OSlib.h"
- 
- #include 
-+#include 
- 
- #ifndef K_OFF
- #define K_OFF 0x4
--- 
-2.8.1
-

diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
new file mode 100644
index 000..8a3cb76
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
@@ -0,0 +1,36 @@
+From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Wed, 11 Oct 2017 16:11:49 +0300
+Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor
+ functions for new glibc
+
+Commits d732c36597fa and 84e3b96b5313 added the include to some files, but
+missed config/udev.c, where the major and minor functions are used as well.
+This should be Linux-only, so we don't need the sys/mkdev.h case here for
+Solaris.
+
+Signed-off-by: Mart Raudsepp 
+---
+https://bugs.gentoo.org/633530
+https://patchwork.freedesktop.org/patch/181800/
+
+ config/udev.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/config/udev.c b/config/udev.c
+index 932f230..b3b8d0f 100644
+--- a/config/udev.c
 b/config/udev.c
+@@ -30,6 +30,9 @@
+ #include 
+ #include 
+ #include 
++#ifdef HAVE_SYS_SYSMACROS_H
++#include 
++#endif
+ 
+ #include "input.h"
+ #include "inputstr.h"
+-- 
+2.10.2
+

diff --git a/x11-base/xorg-server/xorg-server-1.19.3.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.5.ebuild
similarity index 97%
rename from x11-base/xorg-server/xorg-server-1.19.3.ebuild
rename to 

[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

2016-10-01 Thread Felix Janda
commit: 3406b7b5a9c63f1f14f3574b437801e098b4f619
Author: Felix Janda  posteo  de>
AuthorDate: Sat Oct  1 19:22:44 2016 +
Commit: Felix Janda  posteo  de>
CommitDate: Sat Oct  1 19:25:24 2016 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=3406b7b5

x11-base/xorg-server: add version 1.18.3 for arm

Reduce KEYWORDS to arm since this is the only arch that still
needs patching.

 x11-base/xorg-server/Manifest  |   3 +
 ...rver-1.18-support-multiple-Files-sections.patch |  53 +
 x11-base/xorg-server/xorg-server-1.18.3-r99.ebuild | 243 +
 3 files changed, 299 insertions(+)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6c5da35..45e2d2d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -7,9 +7,12 @@ AUX xorg-server-1.14.3-musl.patch 916 SHA256 
aa3d44a6b21a7991eb730d5ddf345e8ab9c
 AUX xorg-server-1.17-ia64-fix_inx_outx.patch 1539 SHA256 
4c844b2d41b6412304b8a918e3cd93d8f2ab8dad8e6a22310cd87d1f3d8f5e95 SHA512 
1db65132bb04eff380d38ccc8441f9f9e5286d7a47956495c0a7de7978107d15e5638d05df0aabbcd11687dd03189a7ac50fca51d755d082869aed71e66dbda1
 WHIRLPOOL 
8f7f3d107e2f8ce5e07d5dac9bf68b7547425943c3e6b6db92eab8bebc0194da53384c953f5e823a5284025e1bbcf18000b497d31de7c5d46e43f9cc0215
 AUX xorg-server-1.17-support-multiple-Files-sections.patch 2256 SHA256 
1cc57d2e8449d50737c507005df348610bb68241fe36e997e4803b3b8b3e6d86 SHA512 
e3141727c993e02b2e067095807e96ef0cc82e2e7c8b65664d0530ef05a0f7b9170272e4e1e3523ede3f1cc23b00c4776785b8299e0b58a6e7fd56062aecefb6
 WHIRLPOOL 
078a5e30777a8f6e908421a1c7cc4a7e63c23f57b600bb1117bc1e8de2db0e6440870f811e65283acaa48da06fcc5666434d2bdce257709344e8f584d1525623
 AUX xorg-server-1.17.4-arm-musl.patch 682 SHA256 
b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0 SHA512 
b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09
 WHIRLPOOL 
3a197692f3d5a7563294248784d8afb5d74eb19e8533cab5166364e96753e0c99c1cbfc236b74c9fcfa553822e277b62f19a4b7193697c9e0c991d3f00de5b8e
+AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 SHA256 
07ef91cb5da75d5165d10d5bc29c58a8b003e743092c1e290453bd6f82a2cf63 SHA512 
5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 WHIRLPOOL 
08fa76e82278cc103ba91555d679413409fd70c29609950e9c1fdd7cfc1e13d5d5b76dc2891465b8faa0fca37c89a32556d0c4cb644a131a7abd332a91fc6cad
 AUX xorg-sets.conf 199 SHA256 
1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 
910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 WHIRLPOOL 
4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 
abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 
f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74
 WHIRLPOOL 
63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
 DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 
0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 
4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376
 WHIRLPOOL 
c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
+DIST xorg-server-1.18.3.tar.bz2 5867330 SHA256 
ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd SHA512 
9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171
 WHIRLPOOL 
8ddf040ff24a4668a460b323b6604347120868658d61b9b84853568f768f7f84267d7caf299c4fe306aeff0bc68d28613a51eaee5a2904bfd524e2aac7ff2e7a
 EBUILD xorg-server-1.16.4-r99.ebuild 6767 SHA256 
9d2027c38b5e6cb0f8ecb7f97733172af29d2834dfb023a5f3bdc5a178938cf5 SHA512 
08b8b271c273ba27ac06fcca259ffdf87beaf8768ee326af8750a4f79bf78b99d935d2afa1249086961d5f937e65d597db7f08831d4df7db56ab65e2d9a36f25
 WHIRLPOOL 
b94da2f8bbccefd58b53437042cc3211a75abeaefa814e0fae4b829db055ce4034994dd1395fa2a809aa7c52af16140859de1920d1324a253aa688f1d7a5b911
 EBUILD xorg-server-1.17.4.ebuild 6282 SHA256 
d522e5273a368d66e8cd95906c47873009325dd83cd29dd9dfb4dd3765c8a675 SHA512 
ca9bb36a6c1bb26a579f44496931a8302c8b78c1a5287cbd772447cd79c7b468785b5dfb28368aad47ac8ed4368dab65313ca68528d7145566eb8561d184a2ef
 WHIRLPOOL 
019705c66bc05cbaa8b08affe45de151ec04ccc101df6cb717ec926a7dcadb085f74a774801c3b516dfd01f930fb3ceb00db7047ac93741b768542f0b0a9c11e
+EBUILD xorg-server-1.18.3-r99.ebuild 6115 SHA256