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

2024-01-17 Thread Matt Turner 
commit: af7147991b6712d002ebe15e1c667752e879a30e
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jan 17 16:34:35 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jan 17 16:36:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af714799

x11-base/xorg-server: Drop old versions

Bug: https://bugs.gentoo.org/919803
Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/Manifest  |   1 -
 ...1.9-xephyr-Don-t-check-for-SeatId-anymore.patch |  66 ---
 x11-base/xorg-server/xorg-server-21.1.10.ebuild| 192 
 x11-base/xorg-server/xorg-server-21.1.9.ebuild | 194 -
 4 files changed, 453 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a95d91d46cc0..129869f4ebbc 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,2 @@
 DIST xorg-server-21.1.10.tar.xz 4935984 BLAKE2B 
c06d5f09e79b608d9e37f43ed05a0932d9e195cc0da418621c2db45be85ccceef38b14631a4b90e78468c845e4852dc07c65208138b93975f091b2139e437a60
 SHA512 
8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926
 DIST xorg-server-21.1.11.tar.xz 4985464 BLAKE2B 
0a18840979bb8b20b02eca9d737f20ddcf92a4771386074c38692df8a1c9b0f471af2211f3006f845ad0dd887b3844b7e7aac761bc12fc4e4177f1ada32ec503
 SHA512 
ad5edacbe8c7e2ebe6b4a690af94c7ea5ebc781d00b0e58ae2d273c78ceee2fa00b86d10479ad69da1b3233490619bae5a33db64c967c24bbfc5d5d39ddce1cb
-DIST xorg-server-21.1.9.tar.xz 4935860 BLAKE2B 
8e0a2e0f5fc4d06a08c1424fe618da9822e951f5b744b4cac1b1e14305ab598b162e4f08fb53ba5e60d0001257216755a576b470c961c26a909d66e9a46d1c77
 SHA512 
9044e1b9222616fb63aea444b75f4ca6582edb7d899018f8ea30359e57edf04b1555e69397ebc4d288f7e36d6b82a54dde3895f11d414573d229e908ac17bfe8

diff --git 
a/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch
 
b/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch
deleted file mode 100644
index 64581c9d0a18..
--- 
a/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/884221
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1192
-
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis 
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH xserver] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed

- hw/kdrive/ephyr/ephyrinit.c | 34 --
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
 a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
- KdKeyboardInfo *ki;
- KdPointerInfo *pi;
- 
--if (!SeatId) {
--KdAddKeyboardDriver();
--KdAddPointerDriver();
--
--if (!kdHasKbd) {
--ki = KdNewKeyboard();
--if (!ki)
--FatalError("Couldn't create Xephyr keyboard\n");
--ki->driver = 
--KdAddKeyboard(ki);
--}
-+KdAddKeyboardDriver();
-+KdAddPointerDriver();
-+
-+if (!kdHasKbd) {
-+ki = KdNewKeyboard();
-+if (!ki)
-+FatalError("Couldn't create Xephyr keyboard\n");
-+ki->driver = 
-+KdAddKeyboard(ki);
-+}
- 
--if (!kdHasPointer) {
--pi = KdNewPointer();
--if (!pi)
--FatalError("Couldn't create Xephyr pointer\n");
--pi->driver = 
--KdAddPointer(pi);
--}
-+if (!kdHasPointer) {
-+pi = KdNewPointer();
-+if (!pi)
-+FatalError("Couldn't create Xephyr pointer\n");
-+pi->driver = 
-+KdAddPointer(pi);
- }
- 
- KdInitInput();
--- 
-2.41.0
-

diff --git a/x11-base/xorg-server/xorg-server-21.1.10.ebuild 
b/x11-base/xorg-server/xorg-server-21.1.10.ebuild
deleted file mode 100644
index 3d6ab7fc6830..
--- a/x11-base/xorg-server/xorg-server-21.1.10.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git;
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != * ]]; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390

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

2023-07-22 Thread Matt Turner 
commit: de718a87b2cedfc40155f05af6fd477b14cabcb8
Author: Ahmed Charles  ahmedcharles  com>
AuthorDate: Thu Jul 20 18:53:12 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Jul 22 17:24:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de718a87

x11-base/xorg-server: fix xf86-video-nouveau build

Closes: https://bugs.gentoo.org/885763
Closes: https://github.com/gentoo/gentoo/pull/31985
Signed-off-by: Ahmed Charles  ahmedcharles.com>
Signed-off-by: Matt Turner  gentoo.org>

 .../xorg-server/files/xorg-server-21.1.8-wfb.patch |  43 +
 x11-base/xorg-server/xorg-server-21.1.8-r2.ebuild  | 195 +
 2 files changed, 238 insertions(+)

diff --git a/x11-base/xorg-server/files/xorg-server-21.1.8-wfb.patch 
b/x11-base/xorg-server/files/xorg-server-21.1.8-wfb.patch
new file mode 100644
index ..48cdbd017088
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.8-wfb.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/885763
+https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1114
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7
+
+From 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7 Mon Sep 17 00:00:00 2001
+From: Florian Weimer 
+Date: Thu, 13 Apr 2023 15:45:58 +0200
+Subject: [PATCH] fb: Declare wfbFinishScreenInit, wfbScreenInit for
+ !FB_ACCESS_WRAPPER
+
+xf86-video-nouveau calls wfbScreenInit without defining
+FB_ACCESS_WRAPPER (which has other unintended side effects).
+Presently, this compiles and links because compilers still support
+implicit function declarations, but this is going to change fairly
+soon.  This seems to be the most straightforward change to keep
+the driver building.
+---
+ fb/fb.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/fb/fb.h b/fb/fb.h
+index 08143a0d49..309f15294c 100644
+--- a/fb/fb.h
 b/fb/fb.h
+@@ -1027,7 +1027,6 @@ extern _X_EXPORT Bool
+int dpiy, int width, /* pixel width of frame buffer */
+int bpp);/* bits per pixel of frame buffer */
+ 
+-#ifdef FB_ACCESS_WRAPPER
+ extern _X_EXPORT Bool
+ wfbFinishScreenInit(ScreenPtr pScreen,
+ void *pbits,
+@@ -1049,7 +1048,6 @@ wfbScreenInit(ScreenPtr pScreen,
+   int width,
+   int bpp,
+   SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
+-#endif
+ 
+ extern _X_EXPORT Bool
+ fbFinishScreenInit(ScreenPtr pScreen,
+-- 
+GitLab
+

diff --git a/x11-base/xorg-server/xorg-server-21.1.8-r2.ebuild 
b/x11-base/xorg-server/xorg-server-21.1.8-r2.ebuild
new file mode 100644
index ..ce07240d3cc7
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.8-r2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit flag-o-matic xorg-3 meson
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git;
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != * ]]; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev 
unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   media-libs/libglvnd[X]
+   dev-libs/libbsd
+   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
+   xorg? (
+   >=x11-libs/libxcvt-0.1.0
+   )
+   xnest? (
+   >=x11-libs/libXext-1.0.99.4
+   >=x11-libs/libX11-1.1.5
+   )
+   xephyr? (
+   x11-libs/libxcb
+   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? (
+   >=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+   >=media-libs/libepoxy-1.5.4[X,egl(+)]
+   )
+   udev? ( virtual/libudev:= )
+   unwind? ( sys-libs/libunwind:= )
+   selinux? (
+   sys-process/audit
+   sys-libs/libselinux:=
+   )
+   systemd? (
+   sys-apps/dbus
+   sys-apps/systemd
+   )
+   elogind? (
+   sys-apps/dbus
+   sys-auth/elogind[pam]
+   sys-auth/pambase[elogind]
+   )
+

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

2023-02-26 Thread Matt Turner 
commit: edb9d8bbd529347bd374f60b841c9899a12d6dae
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Feb 26 23:44:26 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Feb 26 23:44:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb9d8bb

x11-base/xorg-server: Drop old versions

Bug: https://bugs.gentoo.org/893438
Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/Manifest  |   1 -
 .../files/xorg-server-21.1.4-BadIDChoice.patch |  59 ---
 x11-base/xorg-server/xorg-server-21.1.6.ebuild | 195 -
 3 files changed, 255 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 29a64821bd89..b061ccbf2fac 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,2 +1 @@
-DIST xorg-server-21.1.6.tar.xz 4977496 BLAKE2B 
8bcfa0a29f7b84b3ba9357d8ae9b1c7a5dc108159cf059f9c76c2c15f00be0d34964a3240937d146ae5f58a2d94deb091facacab984f8f905848bef5679cf46a
 SHA512 
5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239
 DIST xorg-server-21.1.7.tar.xz 4933292 BLAKE2B 
327e217dcd632d9c013a330dbb0f93bf3c1bf6088906fcb3ff2959574fb6958c215a2ab6ed41b57250a9f200bcc3987bf87c5ffd11c7a7088c7fe6f1a245bd4b
 SHA512 
e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5

diff --git a/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch 
b/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch
deleted file mode 100644
index def3c58714b4..
--- a/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/857483
-https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
-
-From f61307631203ab0266c035db07c2f776cf7c6cf4 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan 
-Date: Tue, 12 Jul 2022 14:44:48 +0200
-Subject: [PATCH] dix: Fix overzealous caching of ResourceClientBits()
-
-Commit c7311654 cached the value of ResourceClientBits(), but that value
-depends on the `MaxClients` value set either from the command line or
-from the configuration file.
-
-For the latter, a call to ResourceClientBits() is issued before the
-configuration file is read, meaning that the cached value is from the
-default, not from the maximum number of clients set in the configuration
-file.
-
-That obviously causes all sort of issues, including memory corruption
-and crashes of the Xserver when reaching the default limit value.
-
-To avoid that issue, also keep the LimitClient value, and recompute the
-ilog2() value if that changes, as on startup when the value is set from
-the the xorg.conf ServerFlags section.
-
-v2: Drop the `cache == 0` test
-Rename cache vars
-
-Fixes: c7311654 - dix: cache ResourceClientBits() value
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
-Signed-off-by: Olivier Fourdan 
-Reviewed-by: Adam Jackson 
-(cherry picked from commit 2efa6d659508346358a1ef27b2393e18843f66a3)
 a/dix/resource.c
-+++ b/dix/resource.c
-@@ -620,12 +620,15 @@ ilog2(int val)
- unsigned int
- ResourceClientBits(void)
- {
--static unsigned int cached = 0;
-+static unsigned int cache_ilog2 = 0;
-+static unsigned int cache_limit = 0;
- 
--if (cached == 0)
--  cached = ilog2(LimitClients);
-+if (LimitClients != cache_limit) {
-+cache_limit = LimitClients;
-+cache_ilog2 = ilog2(LimitClients);
-+}
- 
--return cached;
-+return cache_ilog2;
- }
- 
- /*
--- 
-GitLab
-
-

diff --git a/x11-base/xorg-server/xorg-server-21.1.6.ebuild 
b/x11-base/xorg-server/xorg-server-21.1.6.ebuild
deleted file mode 100644
index 552f91189bcb..
--- a/x11-base/xorg-server/xorg-server-21.1.6.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git;
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != * ]]; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev 
unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   media-libs/libglvnd[X]
-   dev-libs/libbsd
-   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
-

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

2022-12-05 Thread Sam James 
commit: 632db727dc0c879fa4eb1aedcb747d9a9265d330
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  5 10:17:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  5 10:19:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632db727

x11-base/xorg-server: backport BadIDChoice fix w/ MaxClients

I was hoping this would slip into a release but it hasn't yet.

In any case, this fix has been on master for a while & I've
been running with it for months.

Closes: https://bugs.gentoo.org/857483
Closes: https://bugs.gentoo.org/875977
Signed-off-by: Sam James  gentoo.org>

 .../files/xorg-server-21.1.4-BadIDChoice.patch | 59 ++
 ...er-.ebuild => xorg-server-21.1.4-r1.ebuild} |  7 ++-
 x11-base/xorg-server/xorg-server-.ebuild   |  2 +-
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch 
b/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch
new file mode 100644
index ..def3c58714b4
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/857483
+https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
+https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
+
+From f61307631203ab0266c035db07c2f776cf7c6cf4 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan 
+Date: Tue, 12 Jul 2022 14:44:48 +0200
+Subject: [PATCH] dix: Fix overzealous caching of ResourceClientBits()
+
+Commit c7311654 cached the value of ResourceClientBits(), but that value
+depends on the `MaxClients` value set either from the command line or
+from the configuration file.
+
+For the latter, a call to ResourceClientBits() is issued before the
+configuration file is read, meaning that the cached value is from the
+default, not from the maximum number of clients set in the configuration
+file.
+
+That obviously causes all sort of issues, including memory corruption
+and crashes of the Xserver when reaching the default limit value.
+
+To avoid that issue, also keep the LimitClient value, and recompute the
+ilog2() value if that changes, as on startup when the value is set from
+the the xorg.conf ServerFlags section.
+
+v2: Drop the `cache == 0` test
+Rename cache vars
+
+Fixes: c7311654 - dix: cache ResourceClientBits() value
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
+Signed-off-by: Olivier Fourdan 
+Reviewed-by: Adam Jackson 
+(cherry picked from commit 2efa6d659508346358a1ef27b2393e18843f66a3)
+--- a/dix/resource.c
 b/dix/resource.c
+@@ -620,12 +620,15 @@ ilog2(int val)
+ unsigned int
+ ResourceClientBits(void)
+ {
+-static unsigned int cached = 0;
++static unsigned int cache_ilog2 = 0;
++static unsigned int cache_limit = 0;
+ 
+-if (cached == 0)
+-  cached = ilog2(LimitClients);
++if (LimitClients != cache_limit) {
++cache_limit = LimitClients;
++cache_ilog2 = ilog2(LimitClients);
++}
+ 
+-return cached;
++return cache_ilog2;
+ }
+ 
+ /*
+-- 
+GitLab
+
+

diff --git a/x11-base/xorg-server/xorg-server-.ebuild 
b/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild
similarity index 96%
copy from x11-base/xorg-server/xorg-server-.ebuild
copy to x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild
index 316e0c3ba53c..85f83743b7ff 100644
--- a/x11-base/xorg-server/xorg-server-.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild
@@ -44,7 +44,7 @@ CDEPEND="
>=x11-libs/libX11-1.1.5
)
xephyr? (
-   x11-libs/libxcb[xkb]
+   x11-libs/libxcb
x11-libs/xcb-util
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
@@ -95,6 +95,11 @@ REQUIRED_USE="!minimal? (
elogind? ( udev )
?? ( elogind systemd )"
 
+UPSTREAMED_PATCHES=(
+   # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
+   "${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch
+)
+
 PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch

diff --git a/x11-base/xorg-server/xorg-server-.ebuild 
b/x11-base/xorg-server/xorg-server-.ebuild
index 316e0c3ba53c..b70fa161d379 100644
--- a/x11-base/xorg-server/xorg-server-.ebuild
+++ b/x11-base/xorg-server/xorg-server-.ebuild
@@ -44,7 +44,7 @@ CDEPEND="
>=x11-libs/libX11-1.1.5
)
xephyr? (
-   x11-libs/libxcb[xkb]
+   x11-libs/libxcb
x11-libs/xcb-util
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms

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

2022-06-03 Thread Sam James 
commit: e90981351332cd70992e6458fc7aec721b883dce
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  3 08:38:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  3 08:38:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9098135

x11-base/xorg-server: backport present crash fix

Closes: https://bugs.gentoo.org/830482
Signed-off-by: Sam James  gentoo.org>

 .../xorg-server-21.1.3-present-null-check.patch|  36 
 x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild  | 190 +
 2 files changed, 226 insertions(+)

diff --git 
a/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch 
b/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch
new file mode 100644
index ..15d653320708
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.3-present-null-check.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/22d58188
+https://bugs.gentoo.org/830482
+
+From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= 
+Date: Thu, 13 Jan 2022 00:47:27 +0100
+Subject: [PATCH] present: Check for NULL to prevent crash
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
+Signed-off-by: Błażej Szczygieł 
+Tested-by: Aaron Plattner 
+--- a/present/present_scmd.c
 b/present/present_scmd.c
+@@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, 
WindowPtr window)
+ if (!screen_priv->info)
+ return NULL;
+ 
++if (!screen_priv->info->get_crtc)
++return NULL;
++
+ return (*screen_priv->info->get_crtc)(window);
+ }
+ 
+@@ -196,6 +199,9 @@ present_flush(WindowPtr window)
+ if (!screen_priv->info)
+ return;
+ 
++if (!screen_priv->info->flush)
++return;
++
+ (*screen_priv->info->flush) (window);
+ }
+ 
+GitLab

diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild 
b/x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild
new file mode 100644
index ..771c59b73114
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit xorg-3 meson
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git;
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != * ]]; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev 
unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   media-libs/libglvnd[X]
+   dev-libs/libbsd
+   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/libxcvt-0.1.0
+   >=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
+   >=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:= )
+   selinux? (
+   sys-process/audit
+   sys-libs/libselinux:=
+   )
+   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-2021.4.99.2
+   >=x11-libs/xtrans-1.3.5
+   media-fonts/font-util
+"
+RDEPEND="${CDEPEND}
+   !systemd? ( gui-libs/display-manager-init )
+   selinux? ( sec-policy/selinux-xserver )
+   xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+"
+BDEPEND="
+   sys-devel/flex
+"
+PDEPEND="
+   xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+   || ( ${IUSE_SERVERS} )
+   )
+   elogind? ( udev )
+   ?? ( elogind systemd

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

2022-04-21 Thread Sam James 
commit: 70d74dc715b01cd841ba931b9e3f3537eea50de6
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 21 18:34:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 21 18:49:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d74dc7

x11-base/xorg-server: fix build with GCC 12

Note that this isn't just a boring build-time fix as it changes
the sizes needed for malloc, so revbump.

Closes: https://bugs.gentoo.org/839822
Signed-off-by: Sam James  gentoo.org>

 .../files/xorg-server-21.1.3-gcc12.patch   |  84 +
 x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild  | 189 +
 2 files changed, 273 insertions(+)

diff --git a/x11-base/xorg-server/files/xorg-server-21.1.3-gcc12.patch 
b/x11-base/xorg-server/files/xorg-server-21.1.3-gcc12.patch
new file mode 100644
index ..d34809e0a776
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.3-gcc12.patch
@@ -0,0 +1,84 @@
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e
+https://bugs.gentoo.org/839822
+
+From c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan 
+Date: Thu, 20 Jan 2022 10:20:38 +0100
+Subject: [PATCH] render: Fix build with gcc 12
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The xserver fails to compile with the latest gcc 12:
+
+ render/picture.c: In function ‘CreateSolidPicture’:
+ render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is 
partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds]
+  874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill;
+  |  ^~
+ render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’
+  868 | pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictSolidFill));
+  | 
^
+ render/picture.c: In function ‘CreateLinearGradientPicture’:
+ render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is 
partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
+  906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear;
+  |  ^~
+ render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’
+  899 | pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictLinearGradient));
+  | 
^~
+ render/picture.c: In function ‘CreateConicalGradientPicture’:
+ render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is 
partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
+  989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical;
+  |  ^~
+ render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’
+  982 | pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictConicalGradient));
+  | 
^~~
+ cc1: some warnings being treated as errors
+ ninja: build stopped: subcommand failed.
+
+This is because gcc 12 has become stricter and raises a warning now.
+
+Fix the warning/error by allocating enough memory to store the union
+struct.
+
+Signed-off-by: Olivier Fourdan 
+Acked-by: Michel Dänzer 
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256
+--- a/render/picture.c
 b/render/picture.c
+@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int 
*error)
+ }
+ 
+ pPicture->id = pid;
+-pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
++pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+ if (!pPicture->pSourcePict) {
+ *error = BadAlloc;
+ free(pPicture);
+@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, 
xPointFixed * p2,
+ }
+ 
+ pPicture->id = pid;
+-pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictLinearGradient));
++pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+ if (!pPicture->pSourcePict) {
+ *error = BadAlloc;
+ free(pPicture);
+@@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * 
inner,
+ }
+ 
+ pPicture->id = pid;
+-pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictRadialGradient));
++pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
+ if (!pPicture->pSourcePict) {
+ *error = BadAlloc;
+ free(pPicture);
+@@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * 
center, xFixed angle,
+ }
+ 
+ pPicture->id = pid;
+-pPicture->pSourcePict = (SourcePictPtr) 
malloc(sizeof(PictConicalGradient));
++pPicture->pSourcePict =

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

2021-12-20 Thread Sam James 
commit: c40287e2a259a9d9e13ee6055748d4d5b0b9f8b9
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 21 00:51:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 21 00:51:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40287e2

x11-base/xorg-server: backport upstream resume/logind fix

Closes: https://bugs.gentoo.org/829496
Signed-off-by: Sam James  gentoo.org>

 .../xorg-server-21.1.2-fix-resume-logind.patch | 148 +
 x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild  | 185 +
 2 files changed, 333 insertions(+)

diff --git 
a/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch 
b/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch
new file mode 100644
index ..1d16e132f62a
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch
@@ -0,0 +1,148 @@
+Merged upstream into master, this is the backport PR variant.
+
+https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/833
+https://bugs.gentoo.org/829496
+
+From: Jocelyn Falempe 
+Date: Thu, 16 Dec 2021 15:46:43 +0100
+Subject: [PATCH 1/2] xf86/logind: Fix compilation error when built without
+ logind/platform bus
+
+This was introduced by commit 8eb1396d
+
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1269
+Fixes: da9d012a9 - xf86/logind: Fix drm_drop_master before vt_reldisp
+
+Signed-off-by: Jocelyn Falempe 
+Reviewed-by: Hans de Goede 
+--- a/hw/xfree86/common/xf86Events.c
 b/hw/xfree86/common/xf86Events.c
+@@ -383,14 +383,7 @@ xf86VTLeave(void)
+ xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]);
+ 
+ if (systemd_logind_controls_session()) {
+-for (i = 0; i < xf86_num_platform_devices; i++) {
+-if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
+-int major, minor;
+-major = xf86_platform_odev_attributes(i)->major;
+-minor = xf86_platform_odev_attributes(i)->minor;
+-systemd_logind_drop_master(major, minor);
+-}
+-}
++systemd_logind_drop_master();
+ }
+ 
+ if (!xf86VTSwitchAway())
+--- a/hw/xfree86/os-support/linux/systemd-logind.c
 b/hw/xfree86/os-support/linux/systemd-logind.c
+@@ -308,13 +308,19 @@ cleanup:
+  * and ensure the drm_drop_master is done before
+  * VT_RELDISP when switching VT
+  */
+-void systemd_logind_drop_master(int _major, int _minor)
++void systemd_logind_drop_master(void)
+ {
+-struct systemd_logind_info *info = _info;
+-dbus_int32_t major = _major;
+-dbus_int32_t minor = _minor;
++int i;
++for (i = 0; i < xf86_num_platform_devices; i++) {
++if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
++dbus_int32_t major, minor;
++struct systemd_logind_info *info = _info;
+ 
+-systemd_logind_ack_pause(info, minor, major);
++major = xf86_platform_odev_attributes(i)->major;
++minor = xf86_platform_odev_attributes(i)->minor;
++systemd_logind_ack_pause(info, minor, major);
++}
++}
+ }
+ 
+ static DBusHandlerResult
+--- a/include/systemd-logind.h
 b/include/systemd-logind.h
+@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char 
*path, Bool *paus);
+ void systemd_logind_release_fd(int major, int minor, int fd);
+ int systemd_logind_controls_session(void);
+ void systemd_logind_vtenter(void);
+-void systemd_logind_drop_master(int major, int minor);
++void systemd_logind_drop_master(void);
+ #else
+ #define systemd_logind_init()
+ #define systemd_logind_fini()
+@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor);
+ #define systemd_logind_release_fd(major, minor, fd) close(fd)
+ #define systemd_logind_controls_session() 0
+ #define systemd_logind_vtenter()
+-#define systemd_logind_drop_master(major, minor)
++#define systemd_logind_drop_master()
+ #endif
+ 
+ #endif
+GitLab
+From 66890ca569291a53ea9cdc6ec19070173e522260 Mon Sep 17 00:00:00 2001
+From: Jocelyn Falempe 
+Date: Fri, 17 Dec 2021 10:18:25 +0100
+Subject: [PATCH 2/2] xf86/logind: fix missing call to vtenter if the platform
+ device is not paused
+
+If there is one platform device, which is not paused nor resumed,
+systemd_logind_vtenter() will never get called.
+This break suspend/resume, and switching to VT on system with Nvidia
+proprietary driver.
+This is a regression introduced by f5bd039633fa83
+
+So now call systemd_logind_vtenter() if there are no paused
+platform devices.
+
+Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1271
+Fixes: f5bd0396 - xf86/logind: fix call systemd_logind_vtenter after receiving 
drm device resume
+
+Signed-off-by: Jocelyn Falempe 
+Tested-by: Olivier Fourdan 
+Reviewed-by: Hans de Goede 
+--- a/hw/xfree86/os-support/linux/systemd-logind.c
 b/hw/xfree86/os-support/linux/systemd-logind.c
+@@ -316,6 +316,7 @@ void

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

2020-06-24 Thread Matt Turner 
commit: d4da40d328f432a363638a2e520cfbf84b06c7e0
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jun 24 19:57:25 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jun 24 20:13:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4da40d3

x11-base/xorg-server: Drop old versions

Signed-off-by: Matt Turner  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..000
--- 
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

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

2019-01-19 Thread Matt Turner 
commit: 4c14dca574c964ff238b45966d6d756fe01220d6
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 20 05:35:41 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 20 05:43:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c14dca5

x11-base/xorg-server: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/Manifest  |   1 -
 .../files/xorg-server-1.19.4-sysmacros.patch   |  36 
 ...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch |  39 
 x11-base/xorg-server/metadata.xml  |   1 -
 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild  | 224 -
 5 files changed, 301 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3bc38c0e6c1..4dc15913393 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,2 +1 @@
-DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 
9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4
 SHA512 
ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba

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
deleted file mode 100644
index 8a3cb769292..000
--- a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 
b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
deleted file mode 100644
index d7e5e511e5d..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tapani=20P=C3=A4lli?= 
-Date: Tue, 28 Nov 2017 09:23:29 +0200
-Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes blending issues seen with kwin and gnome-shell when
-32bit visual has sRGB capability set.
-
-Reviewed-by: Adam Jackson 
-Signed-off-by: Tapani Pälli 
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655

- glx/glxscreens.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/glx/glxscreens.c b/glx/glxscreens.c
-index 73444152a..596d972e0 100644
 a/glx/glxscreens.c
-+++ b/glx/glxscreens.c
-@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
- /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */
- if (visual->nplanes == 32 && config->rgbBits != 32)
- continue;
-+/* If it's the 32-bit RGBA visual, do not pick sRGB capable config.
-+ * This can cause issues with compositors that are not sRGB aware.
-+ */
-+if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE)
-+continue;
- /* Can't use the same FBconfig for multiple X visuals.  I think. */
- if (config->visualID != 0)
- continue;
--- 
-2.17.0
-

diff --git a/x11-base/xorg-server/metadata.xml 
b/x11-base/xorg-server/metadata.xml
index 8c8c243082e..74e52195b25 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -9,7 +9,6 @@
Build the

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

2018-11-01 Thread Matt Turner 
commit: 513f36b7d380d1aca9cc6515282630759a192f34
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Nov  1 07:03:20 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov  1 07:06:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513f36b7

Revert "x11-base/xorg-server: Drop old versions"

This reverts commit ea5504ecb9e9163a17c7f693d377b2d8e7e15fa7.

Unfortunately both tigervnc and nvidia-drivers depend on this version.

Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/Manifest  |   3 +
 .../files/xorg-server-1.19.4-sysmacros.patch   |  36 
 ...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch |  39 
 x11-base/xorg-server/metadata.xml  |   1 +
 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild  | 224 +
 x11-base/xorg-server/xorg-server-1.20.1.ebuild | 221 
 x11-base/xorg-server/xorg-server-1.20.2.ebuild | 221 
 7 files changed, 745 insertions(+)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4dc15913393..290c8d10b68 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1,4 @@
+DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
+DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B 
ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75
 SHA512 
ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
+DIST xorg-server-1.20.2.tar.bz2 6204242 BLAKE2B 
05333d12ca3ca2bca879410093fb193dc2476780b857cd22dcfb22d0dffe0e17afd161ee3a87030bd76ff4109fa1884768614f0bc26318d576f7c65b885aa425
 SHA512 
1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 
9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4
 SHA512 
ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba

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..8a3cb769292
--- /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/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 
b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
new file mode 100644
index 000..d7e5e511e5d
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
@@ -0,0 +1,39 @@
+From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tapani=20P=C3=A4lli?= 
+Date: Tue, 28 Nov 2017 09:23:29 +0200
+Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes blending issues seen with kwin and gnome-shell when
+32bit visual has sRGB capability set.
+
+Reviewed-by: Adam Jackson 
+Signed-off-by: Tapani Pälli 
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655
+---
+ glx/glxscreens.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/glx/glxscreens.c b/glx/glxscreens.c
+index 73444152a..596d972e0 100644
+---

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

2018-11-01 Thread Matt Turner 
commit: ea5504ecb9e9163a17c7f693d377b2d8e7e15fa7
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Nov  1 06:23:17 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov  1 06:23:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5504ec

x11-base/xorg-server: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/Manifest  |   3 -
 .../files/xorg-server-1.19.4-sysmacros.patch   |  36 
 ...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch |  39 
 x11-base/xorg-server/metadata.xml  |   1 -
 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild  | 224 -
 x11-base/xorg-server/xorg-server-1.20.1.ebuild | 221 
 x11-base/xorg-server/xorg-server-1.20.2.ebuild | 221 
 7 files changed, 745 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 290c8d10b68..4dc15913393 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,4 +1 @@
-DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B 
ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75
 SHA512 
ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
-DIST xorg-server-1.20.2.tar.bz2 6204242 BLAKE2B 
05333d12ca3ca2bca879410093fb193dc2476780b857cd22dcfb22d0dffe0e17afd161ee3a87030bd76ff4109fa1884768614f0bc26318d576f7c65b885aa425
 SHA512 
1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 
9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4
 SHA512 
ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba

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
deleted file mode 100644
index 8a3cb769292..000
--- a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 
b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
deleted file mode 100644
index d7e5e511e5d..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tapani=20P=C3=A4lli?= 
-Date: Tue, 28 Nov 2017 09:23:29 +0200
-Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes blending issues seen with kwin and gnome-shell when
-32bit visual has sRGB capability set.
-
-Reviewed-by: Adam Jackson 
-Signed-off-by: Tapani Pälli 
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655

- glx/glxscreens.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/glx/glxscreens.c b/glx/glxscreens.c
-index 73444152a..596d972e0 100644
 a/glx/glxscreens.c
-+++ b/glx/glxscreens.c
-@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
- /* If it's the

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

2018-10-01 Thread Matt Turner 
commit: e8ff080f8633dfaa490ce62c07068935d6ff0f7e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Oct  1 22:51:21 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Oct  1 22:52:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ff080f

x11-base/xorg-server: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/Manifest  |   1 -
 ...ine-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 -
 x11-base/xorg-server/xorg-server-1.20.0.ebuild | 221 
 3 files changed, 446 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f874c858676..6b4fadcebbc 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,2 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B 
ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75
 SHA512 
ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b

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
deleted file mode 100644
index ebf677ae9c4..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-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);
--extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);
--extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long);
--extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long);
--extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long);
--extern _X_EXPORT void (*xf86WriteMmio32) (int,

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

2018-06-10 Thread Matt Turner 
commit: 2b48a745f377d884219c60a6169a1aee94b59975
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jun 11 02:45:35 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jun 11 02:48:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b48a745

x11-base/xorg-server: Apply patch to fix module loading on alpha

Closes: https://bugs.gentoo.org/548906

 ...ine-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 +
 x11-base/xorg-server/xorg-server-1.20.0.ebuild |   2 +
 2 files changed, 226 insertions(+)

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..ebf677ae9c4
--- /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);
+-extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long);
+-extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long);
+-extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long);
+-extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long);
+-extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long);
++static inline int
++xf86ReadMmio8(void *Base, unsigned long Offset)
++{
++mem_barrier();
++return *(CARD8 *) ((unsigned long) Base + (Offset));
++}
++
++static inline int
++xf86ReadMmio16(void *Base, unsigned long Offset)
++{
++mem_barrier();
++return *(CARD16 *) ((unsigned long) Base + (Offset));
++}
++
++static inline int
++xf86ReadMmio32(void *Base, unsigned long Offset)
++{
++mem_barrier();
++return *(CARD32 *) ((unsigned long) Base + (Offset));
++}
++
++static inline void
++xf86WriteMmio8(int Value, void *Base, unsigned long Offset)
++{
++write_mem_barrier();
++*(CARD8 *) ((unsigned long) Base + (Offset)) = Value;
++}
++
++static inline void
++xf86WriteMmio16(int Value, void *Base, unsigned long Offset)
++{
++write_mem_barrier();
++*(CARD16 *) ((unsigned long) Base + (Offset)) = Value;
++}
++
++static inline void
++xf86WriteMmio32(int Value, void *Base, unsigned long Offset)
++{
++write_mem_barrier();
++*(CARD32 *) ((unsigned long) Base + (Offset)) = Value;
++}
++
+ extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *,
+int);
+ extern _X_EXPORT void

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

2018-04-16 Thread Matt Turner 
commit: 4abddc5e499eef7cdb177e4b8c98219284c376e4
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 17 01:35:22 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 17 01:35:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4abddc5e

x11-base/xorg-server: Cherry-pick two patches from upstream

Closes: https://bugs.gentoo.org/653288
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch |  48 ++
 99.904-xwayland-Fix-build-without-glamor.patch | 175 +
 .../xorg-server/xorg-server-1.19.99.904.ebuild |   7 +-
 3 files changed, 227 insertions(+), 3 deletions(-)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
 
b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
new file mode 100644
index 000..f0c4ed58d33
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
@@ -0,0 +1,48 @@
+From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+Date: Sun, 15 Apr 2018 23:37:45 -0700
+Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef
+ GLAMOR_HAS_GBM
+
+Fixes a compilation error without Glamor.
+
+Bugzilla: https://bugs.gentoo.org/653288
+Signed-off-by: Matt Turner 
+Reviewed-by: Olivier Fourdan 
+---
+ hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++---
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c 
b/hw/xfree86/drivers/modesetting/drmmode_display.c
+index 322ef050b..79e91f0f8 100644
+--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
 b/hw/xfree86/drivers/modesetting/drmmode_display.c
+@@ -998,18 +998,18 @@ static Bool
+ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
+   unsigned width, unsigned height, unsigned bpp)
+ {
+-uint32_t format;
+-
+-if (drmmode->scrn->depth == 30)
+-format = GBM_FORMAT_ARGB2101010;
+-else
+-format = GBM_FORMAT_ARGB;
+-
+ bo->width = width;
+ bo->height = height;
+ 
+ #ifdef GLAMOR_HAS_GBM
+ if (drmmode->glamor) {
++uint32_t format;
++
++if (drmmode->scrn->depth == 30)
++format = GBM_FORMAT_ARGB2101010;
++else
++format = GBM_FORMAT_ARGB;
++
+ #ifdef GBM_BO_WITH_MODIFIERS
+ uint32_t num_modifiers;
+ uint64_t *modifiers = NULL;
+-- 
+2.16.1
+

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
 
b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
new file mode 100644
index 000..312a5e05cdc
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
@@ -0,0 +1,175 @@
+From c3ae963a7b19e05b8296aae8b6354587756d48fa Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan 
+Date: Mon, 16 Apr 2018 09:39:09 +0200
+Subject: [PATCH xserver 1/2] xwayland: Fix build without glamor
+
+Present support in Xwayland relies on glamor, make sure Xwayland can
+be built without glamor by moving references to Present code inside
+the conditional GLAMOR_HAS_GBM.
+
+Reported-by: Matt Turner 
+Signed-off-by: Olivier Fourdan 
+Reviewed-by: Matt Turner 
+Reviewed-by: Roman Gilg 
+---
+ hw/xwayland/Makefile.am |  4 ++--
+ hw/xwayland/meson.build |  3 +--
+ hw/xwayland/xwayland.c  | 10 +-
+ hw/xwayland/xwayland.h  |  7 ++-
+ 4 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
+index 0291afee7..80d3a1f19 100644
+--- a/hw/xwayland/Makefile.am
 b/hw/xwayland/Makefile.am
+@@ -11,7 +11,6 @@ Xwayland_CFLAGS =\
+ 
+ Xwayland_SOURCES =\
+   xwayland.c  \
+-  xwayland-present.c  \
+   xwayland-input.c\
+   xwayland-cursor.c   \
+   xwayland-shm.c  \
+@@ -35,7 +34,8 @@ Xwayland_built_sources =
+ 
+ if GLAMOR_EGL
+ Xwayland_SOURCES +=   \
+-  xwayland-glamor.c
++  xwayland-glamor.c   \
++  xwayland-present.c
+ if XV
+ Xwayland_SOURCES +=   \
+   xwayland-glamor-xv.c
+diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
+index 69a5c819a..8d178825e 100644
+--- a/hw/xwayland/meson.build
 b/hw/xwayland/meson.build
+@@ -1,6 +1,5 @@
+ srcs = [
+ 'xwayland.c',
+-'xwayland-present.c',
+ 'xwayland-input.c',
+ 'xwayland-cursor.c',
+

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

2018-04-15 Thread Matt Turner 
commit: 95209f5bb985775383ab3474f1cc461671bd5dae
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr 15 23:01:05 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 15 23:01:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95209f5b

x11-base/xorg-server: Drop old version

 x11-base/xorg-server/Manifest  |   1 -
 .../xorg-server-1.19.99.901-randr-fix-crash.patch  |  44 -
 .../xorg-server/xorg-server-1.19.99.901-r1.ebuild  | 220 -
 3 files changed, 265 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 866e6b9393e..b262359d335 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,2 @@
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-DIST xorg-server-1.19.99.901.tar.bz2 6131851 BLAKE2B 
5b3588fe7c42d10eb89fa4ebea5ab6f2c7fb25f876ec6a5c5b523062f5c712c52c20767aa60b607847b50aa12ec75307b8715d63aa92331b70a1971c8d740670
 SHA512 
c2fbe4868788cd0d6d5fe546acb8c2ddec39ac3e851f352ee438a785a248a048a87073972f51ff98ef36a35a6753f8c2f22c2ecfc719d47dd9bb3c453fdb3ae5
 DIST xorg-server-1.19.99.904.tar.bz2 6083787 BLAKE2B 
7b5ba4601494ab7714a977e6fcced12e373f5aaf30d433560a899d4446116cc4a5e22ae21378fea6ab07b68bad1a2544e065fd1d449b3b155b2c0e8a6787e479
 SHA512 
b9dccc777d0a30c6b40bddffe1f359dde4103539c6598f04bf8cf5f59e6770229221a199c1866b4eba0cf8d2d87fe878985bbd2e3c6ec5b65e3f16195ea8d57e

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch 
b/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch
deleted file mode 100644
index bcaaf867c7a..000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2af0a50a4bb9be9f58681d417ceb9a7029caaf3b Mon Sep 17 00:00:00 2001
-From: Adam Jackson 
-Date: Wed, 28 Feb 2018 11:23:41 -0500
-Subject: [PATCH] randr: Fix a crash on initialization with GPU screens
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RRSetChanged (immediately above) was immune to screens with no master,
-but RRTellChanged was not:
-
-Thread 1 "X" received signal SIGSEGV, Segmentation fault.
-RRTellChanged (pScreen=) at ../../randr/randr.c:576
-576 mastersp = rrGetScrPriv(master);
-(gdb) bt
-#0  RRTellChanged (pScreen=) at ../../randr/randr.c:576
-#1  0x5566f1e9 in RRNoticePropertyChange (value=0x55bfbf28, 
property=70, output=0x55bfef10) at ../../randr/rrproperty.c:153
-#2  RRChangeOutputProperty (output=output@entry=0x55bfef10, 
property=, type=type@entry=19, format=format@entry=32, 
mode=, mode@entry=0, len=len@entry=1, value=0x7fffe77c, 
sendevent=1, pending=0)
-at ../../randr/rrproperty.c:263
-#3  0x5566dba5 in RROutputSetNonDesktop 
(output=output@entry=0x55bfef10, nonDesktop=nonDesktop@entry=0) at 
../../randr/rroutput.c:333
-...
-
-Reported-by: Michel Dänzer 
-Signed-off-by: Adam Jackson 

- randr/randr.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/randr/randr.c b/randr/randr.c
-index 339ad3ece..feb54bcc8 100644
 a/randr/randr.c
-+++ b/randr/randr.c
-@@ -602,6 +602,8 @@ RRTellChanged(ScreenPtr pScreen)
- 
- if (pScreen->isGPU) {
- master = pScreen->current_master;
-+if (!master)
-+return;
- mastersp = rrGetScrPriv(master);
- }
- else {
--- 
-2.16.1
-

diff --git a/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild
deleted file mode 100644
index 19c536df784..000
--- a/x11-base/xorg-server/xorg-server-1.19.99.901-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git;
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != * ]]; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd 
+udev unwind xcsecurity"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl )
-   >=x11-apps/iceauth-1.0.2
-   >=x11-apps/rgb-1.0.3
-   >=x11-apps/xauth-1.0.3
-   x11-apps/xkbcomp
-

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

2017-11-22 Thread Matt Turner 
commit: bc62a23618028a4a4c7d0a94ac8531a03fe3f3e8
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Nov 23 03:12:27 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov 23 03:16:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc62a236

x11-base/xorg-server: Drop old versions

These were only in the tree for old versions of the nvidia-drivers,
which were removed in commit 075b72245180.

 x11-base/xorg-server/Manifest  |   6 +-
 x11-base/xorg-server/files/xdm.initd-9 | 215 ---
 .../files/xorg-server-1.12-cve-2013-1940.patch |  34 ---
 .../files/xorg-server-1.12-cve-2013-4396.patch |  75 ---
 .../files/xorg-server-1.12-cve-2015-3418.patch |  29 ---
 .../files/xorg-server-1.12-disable-acpi.patch  |  11 -
 .../files/xorg-server-1.12-ia64-fix_inx_outx.patch |  60 --
 .../files/xorg-server-1.17-cve-2015-0255-0.patch   | 102 -
 .../files/xorg-server-1.17-cve-2015-0255-1.patch   | 138 
 ...xorg-server-1.17.2-uninit-clientsWritable.patch |  65 --
 .../files/xorg-server-1.18-sysmacros.patch |  59 --
 x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild  | 225 
 x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild  | 233 -
 13 files changed, 1 insertion(+), 1251 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 76e64eb035d..3c7db008745 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,5 +1 @@
-DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 SHA256 
a98fd1589ef92d6f8a633326d387f2f203df72452788a6aaa2bcd4242700fe7f SHA512 
2ac18d36cd8b6d9fcaf98a32e3e6b9107e420476e066a4ac9581f12e9afb7e397614761373a20d96c8fa840886b81ee0ec5cfc812e16876b4922bf6c5fe3f736
 WHIRLPOOL 
5c3ddd654fdecf3285d865b4b864bcaa3de87cd6005f8d500da4250b5b659db69e103743109ec3c72cb79abf24910b6de4ac05c0a7b7bcb2656d5a95c9703d38
-DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 
8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 
70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85
 WHIRLPOOL 
bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
-DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 
3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 
5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6
 WHIRLPOOL 
22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1
-DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 
47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 
f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b
 WHIRLPOOL 
2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
-DIST xorg-server-1.19.5.tar.bz2 5965044 SHA256 
18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 WHIRLPOOL 
01039d524a876ba6bd72713993b1d4d6e21f8ba53536ee3189dce9cc7186010e143754fa708d2ccf10905dd272bc68b14c63f4322548e041dfc23cf00e4c364e
+DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 
23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3
 SHA512 
928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c

diff --git a/x11-base/xorg-server/files/xdm.initd-9 
b/x11-base/xorg-server/files/xdm.initd-9
deleted file mode 100644
index d6e20a6dd73..000
--- a/x11-base/xorg-server/files/xdm.initd-9
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# 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

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

2017-10-11 Thread Mart Raudsepp 
commit: 6f03b7d078f9f8b855ec61c802e5b64edb11f599
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Oct 11 21:48:06 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Oct 11 21:51:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f03b7d0

x11-base/xorg-server: restore still necessary part of sysmacros patch for 1.19.4

Closes: https://bugs.gentoo.org/633530
Package-Manager: Portage-2.3.8, Repoman-2.3.2

 .../files/xorg-server-1.19.4-sysmacros.patch   | 36 ++
 x11-base/xorg-server/xorg-server-1.19.4.ebuild |  1 +
 2 files changed, 37 insertions(+)

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..8a3cb769292
--- /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.4.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.4.ebuild
index bf4762405c4..0a04c061087 100644
--- a/x11-base/xorg-server/xorg-server-1.19.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.4.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
# needed for new eselect-opengl, bug #541232
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+   "${FILESDIR}"/${P}-sysmacros.patch #633530
 )
 
 pkg_pretend() {

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

2017-03-15 Thread Matt Turner 
commit: 2aaa7b0cfe902499e05679aa0883328f0163432c
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 15 19:55:59 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 15 19:56:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aaa7b0c

x11-base/xorg-server: Drop version 1.17.

Was only needed by the now removed x11-drivers/ati-drivers, and contains
security vulnerabilities (bug 611350).

 x11-base/xorg-server/Manifest  |   1 -
 ...rver-1.17-support-multiple-Files-sections.patch |  65 --
 x11-base/xorg-server/xorg-server-1.17.4.ebuild | 246 -
 3 files changed, 312 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index cfb0ea5224f..3c6e294ec40 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,6 +2,5 @@ DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 
SHA256 a98fd1589e
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 
8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 
70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85
 WHIRLPOOL 
bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 
3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 
5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6
 WHIRLPOOL 
22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1
 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 
47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 
f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b
 WHIRLPOOL 
2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
-DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 
0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 
4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376
 WHIRLPOOL 
c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
 DIST xorg-server-1.19.2.tar.bz2 5969543 SHA256 
4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb SHA512 
258c5d615efda28170bf0fd4a19e24fd2cefe086d5ef1aada7a407b8dc2ddaa7d74ad0245e0b13155a3e6d30c65fedf054326e191b6dfe800aae881664d63f16
 WHIRLPOOL 
6ffca7dc695d9551efecbf9061e40862a187f16afba113467640a506c7becdb2e37d7fe042cbfe08af8ba9f2e8f538fd50460ef46a34452796436de15fa463fd

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.17-support-multiple-Files-sections.patch
 
b/x11-base/xorg-server/files/xorg-server-1.17-support-multiple-Files-sections.patch
deleted file mode 100644
index 789a1182a3a..000
--- 
a/x11-base/xorg-server/files/xorg-server-1.17-support-multiple-Files-sections.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From a140d7ce3f37f30b4fed27c5a70ebcc4ed13c612 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
-Date: Tue, 24 Feb 2015 12:57:24 +0100
-Subject: [PATCH] config: Support multiple 'Files' sections
-

- 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 849bf92..5cc3ec7 100644
 a/hw/xfree86/parser/Files.c
-+++ b/hw/xfree86/parser/Files.c
-@@ -76,14 +76,18 @@ static 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 774e2a2..b9fdebb 100644
 a/hw/xfree86/parser/configProcs.h
-+++

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

2017-02-25 Thread Matt Turner 
commit: 06d95b1cb566c0ae19d145ee0f65ec3f8e2093ba
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Feb 25 20:33:18 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Feb 25 20:43:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d95b1c

x11-base/xorg-server: Remove 1.16.4-r5.

Bug: https://bugs.gentoo.org/607096

 x11-base/xorg-server/Manifest  |   1 -
 .../files/xorg-server-1.17-cve-2015-3164-1.patch   |  33 ---
 .../files/xorg-server-1.17-cve-2015-3164-2.patch   | 246 -
 .../files/xorg-server-1.17-cve-2015-3164-3.patch   |  34 ---
 x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild  | 237 
 5 files changed, 551 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 61e76ed095..7aa7d5f51b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,7 +2,6 @@ DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 
SHA256 a98fd1589e
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 
8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 
70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85
 WHIRLPOOL 
bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 
3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 
5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6
 WHIRLPOOL 
22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1
 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 
47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 
f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b
 WHIRLPOOL 
2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
-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.4.tar.bz2 6009508 SHA256 
278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 
2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
 WHIRLPOOL 
f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
 DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 
79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 
37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 WHIRLPOOL 
9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555

diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch 
b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
deleted file mode 100644
index a9f8030227..00
--- a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c4534a38b68aa07fb82318040dc8154fb48a9588 Mon Sep 17 00:00:00 2001
-From: Ray Strode 
-Date: Tue, 5 May 2015 16:43:42 -0400
-Subject: xwayland: Enable access control on open sockets [CVE-2015-3164 1/3]
-
-Xwayland currently allows wide-open access to the X sockets
-it listens on, ignoring Xauth access control.
-
-This commit makes sure to enable access control on the sockets,
-so one user can't snoop on another user's X-over-wayland
-applications.
-
-Signed-off-by: Ray Strode 
-Reviewed-by: Daniel Stone 
-Reviewed-by: Alan Coopersmith 
-Signed-off-by: Keith Packard 
-
-diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
-index 7e8d667..c5bee77 100644
 a/hw/xwayland/xwayland.c
-+++ b/hw/xwayland/xwayland.c
-@@ -483,7 +483,7 @@ listen_on_fds(struct xwl_screen

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

2016-12-27 Thread Mike Frysinger 
commit: f72578ff6ad21268181d6d860a276850a81393b1
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Dec 28 01:33:50 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Dec 28 01:33:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72578ff

x11-base/xorg-server: fix build w/newer glibc #580044

 .../files/xorg-server-1.18-sysmacros.patch | 59 ++
 x11-base/xorg-server/xorg-server-1.18.4.ebuild |  1 +
 x11-base/xorg-server/xorg-server-1.19.0.ebuild |  1 +
 3 files changed, 61 insertions(+)

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
new file mode 100644
index ..5a3dea3
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch
@@ -0,0 +1,59 @@
+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/xorg-server-1.18.4.ebuild 
b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
index 2c6bbb1..35971b9 100644
--- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
# needed for new eselect-opengl, bug #541232
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+   "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044
 )
 
 pkg_pretend() {

diff --git a/x11-base/xorg-server/xorg-server-1.19.0.ebuild 
b/x11-base/xorg-server/xorg-server-1.19.0.ebuild
index 41d4b14..ad88bd3 100644
--- a/x11-base/xorg-server/xorg-server-1.19.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.0.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
# needed for new eselect-opengl, bug #541232
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+   "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044
 )
 
 pkg_pretend() {

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

2016-01-23 Thread Manuel Rüger 
commit: 5f4b088e9064b94d5da69c16075c1f02f6ec116d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sat Jan 23 14:16:06 2016 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sat Jan 23 14:16:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4b088e

x11-base/xorg-server: Version bump. Thanks to Coacher

Changes compared to 1.17.4 ebuild:
- drop nptl USE as glx-tls configure option was dropped upstream
- drop install-libxf86config configure option as was done upstream
- update dep versions according to configure.ac
- drop ia64-fix_inx_outx patch as upstream macro now handles ia64
- update support-multiple-Files-sections patch to apply cleanly

Package-Manager: portage-2.2.27

 x11-base/xorg-server/Manifest  |   1 +
 ...rver-1.18-support-multiple-Files-sections.patch |  53 +
 x11-base/xorg-server/xorg-server-1.18.0.ebuild | 242 +
 3 files changed, 296 insertions(+)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f26dfac..6c1c052 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,3 +4,4 @@ DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 
3c0585607c654ded836da43a45a75492f
 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 
47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 
f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b
 WHIRLPOOL 
2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
 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.0.tar.bz2 5818703 SHA256 
195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 
c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768
 WHIRLPOOL 
439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9

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
new file mode 100644
index 000..0a61145
--- /dev/null
+++ 
b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
@@ -0,0 +1,53 @@
+See http://lists.x.org/archives/xorg-devel/2015-February/045755.html
+
+diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
+index 849bf92..5cc3ec7 100644
+--- a/hw/xfree86/parser/Files.c
 b/hw/xfree86/parser/Files.c
+@@ -76,14 +76,18 @@ static 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 171f8e8..e8199fe 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 327c02a..e0d6139 100644
+--- a/hw/xfree86/parser/read.c
 b/hw/xfree86/parser/read.c
+@@ -110,7 +110,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,

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

2015-09-03 Thread Chí-Thanh Christopher Nguyễn 
commit: 9695eae2fcfd4e20f418a488729639dce3556376
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Thu Sep  3 15:56:58 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Thu Sep  3 15:56:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9695eae2

x11-base/xorg-server: add patches for CVE-2015-3164

Bug: https://bugs.gentoo.org/show_bug.cgi?id=551680

Package-Manager: portage-2.2.20.1

 .../files/xorg-server-1.17-cve-2015-3164-1.patch   |  33 +++
 .../files/xorg-server-1.17-cve-2015-3164-2.patch   | 246 +++
 .../files/xorg-server-1.17-cve-2015-3164-3.patch   |  34 +++
 x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild  | 261 +
 x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild  | 236 +++
 5 files changed, 810 insertions(+)

diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch 
b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
new file mode 100644
index 000..a9f8030
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
@@ -0,0 +1,33 @@
+From c4534a38b68aa07fb82318040dc8154fb48a9588 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Tue, 5 May 2015 16:43:42 -0400
+Subject: xwayland: Enable access control on open sockets [CVE-2015-3164 1/3]
+
+Xwayland currently allows wide-open access to the X sockets
+it listens on, ignoring Xauth access control.
+
+This commit makes sure to enable access control on the sockets,
+so one user can't snoop on another user's X-over-wayland
+applications.
+
+Signed-off-by: Ray Strode 
+Reviewed-by: Daniel Stone 
+Reviewed-by: Alan Coopersmith 
+Signed-off-by: Keith Packard 
+
+diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
+index 7e8d667..c5bee77 100644
+--- a/hw/xwayland/xwayland.c
 b/hw/xwayland/xwayland.c
+@@ -483,7 +483,7 @@ listen_on_fds(struct xwl_screen *xwl_screen)
+ int i;
+ 
+ for (i = 0; i < xwl_screen->listen_fd_count; i++)
+-ListenOnOpenFD(xwl_screen->listen_fds[i], TRUE);
++ListenOnOpenFD(xwl_screen->listen_fds[i], FALSE);
+ }
+ 
+ static void
+-- 
+cgit v0.10.2
+

diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch 
b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch
new file mode 100644
index 000..47b323f
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch
@@ -0,0 +1,246 @@
+From 4b4b9086d02b80549981d205fb1f495edc373538 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Tue, 5 May 2015 16:43:43 -0400
+Subject: os: support new implicit local user access mode [CVE-2015-3164 2/3]
+
+If the X server is started without a '-auth' argument, then
+it gets started wide open to all local users on the system.
+
+This isn't a great default access model, but changing it in
+Xorg at this point would break backward compatibility.
+
+Xwayland, on the other hand is new, and much more targeted
+in scope.  It could, in theory, be changed to allow the much
+more secure default of a "user who started X server can connect
+clients to that server."
+
+This commit paves the way for that change, by adding a mechanism
+for DDXs to opt-in to that behavior.  They merely need to call
+
+LocalAccessScopeUser()
+
+in their init functions.
+
+A subsequent commit will add that call for Xwayland.
+
+Signed-off-by: Ray Strode 
+Reviewed-by: Daniel Stone 
+Reviewed-by: Alan Coopersmith 
+Signed-off-by: Keith Packard 
+
+diff --git a/include/os.h b/include/os.h
+index 6638c84..b2b96c8 100644
+--- a/include/os.h
 b/include/os.h
+@@ -431,11 +431,28 @@ extern _X_EXPORT void
+ ResetHosts(const char *display);
+ 
+ extern _X_EXPORT void
++EnableLocalAccess(void);
++
++extern _X_EXPORT void
++DisableLocalAccess(void);
++
++extern _X_EXPORT void
+ EnableLocalHost(void);
+ 
+ extern _X_EXPORT void
+ DisableLocalHost(void);
+ 
++#ifndef NO_LOCAL_CLIENT_CRED
++extern _X_EXPORT void
++EnableLocalUser(void);
++
++extern _X_EXPORT void
++DisableLocalUser(void);
++
++extern _X_EXPORT void
++LocalAccessScopeUser(void);
++#endif
++
+ extern _X_EXPORT void
+ AccessUsingXdmcp(void);
+ 
+diff --git a/os/access.c b/os/access.c
+index 8fa028e..75e7a69 100644
+--- a/os/access.c
 b/os/access.c
+@@ -102,6 +102,10 @@ SOFTWARE.
+ #include 
+ #include 
+ 
++#ifndef NO_LOCAL_CLIENT_CRED
++#include 
++#endif
++
+ #if defined(TCPCONN) || defined(STREAMSCONN)
+ #include 
+ #endif  /* TCPCONN || STREAMSCONN */
+@@ -225,6 +229,13 @@ static int LocalHostEnabled = FALSE;
+ static int LocalHostRequested = FALSE;
+ static int UsingXdmcp = FALSE;
+ 
++static enum {
++LOCAL_ACCESS_SCOPE_HOST = 0,
++#ifndef NO_LOCAL_CLIENT_CRED
++LOCAL_ACCESS_SCOPE_USER,

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

2015-08-22 Thread Sergei Trofimovich 
commit: ef0ca3a416ad5b5332da5eb15d388ce7f7845e53
Author: Sergei Trofimovich slyfox AT gentoo DOT org
AuthorDate: Sat Aug 22 20:06:18 2015 +
Commit: Sergei Trofimovich slyfox AT gentoo DOT org
CommitDate: Sat Aug 22 20:10:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0ca3a4

x11-base/xorg-server: fix crash on FlushAllOutput, bug #555776

Bug: https://bugs.freedesktop.org/91316
Bug: https://bugs.gentoo.org/555776

Package-Manager: portage-2.2.20

 ...xorg-server-1.17.2-uninit-clientsWritable.patch |  65 ++
 x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild  | 245 +
 2 files changed, 310 insertions(+)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch 
b/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch
new file mode 100644
index 000..6818196
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/show_bug.cgi?id=555776
+
+From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001
+From: Martin Peres martin.pe...@linux.intel.com
+Date: Fri, 17 Jul 2015 17:21:26 +0300
+Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized
+ before use
+
+In WaitForSomething(), the fd_set clientsWritable may be used unitialized when
+the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to
+a crash in FlushAllOutput() after x11proto's commit
+2c94cdb453bc641246cc8b9a876da9799bee1ce7.
+
+The problem did not manifest before because both the XFD_SIZE and the maximum
+number of clients were set to 256. As the connectionTranslation table was
+initalized for the 256 clients to 0, the test on the index not being 0 was
+aborting before dereferencing the client #0.
+
+As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE
+got bumped to 512. This lead the OutputPending fd_set to have any fd above 256
+to be uninitialized which in turns lead to reading an index after the end of
+the ConnectionTranslation table. This index would then be used to find the
+client corresponding to the fd marked as pending writes and would also result
+to an out-of-bound access which would usually be the fatal one.
+
+Fix this by zeroing the clientsWritable fd_set at the beginning of
+WaitForSomething(). In this case, the bottom part of the loop, which would
+indirectly call FlushAllOutput, will not do any work but the next call to
+select will result in the execution of the right codepath. This is exactly what
+we want because we need to know the writable clients before handling them. In
+the end, it also makes sure that the fds above MaxClient are initialized,
+preventing the crash in FlushAllOutput().
+
+Thanks to everyone involved in tracking this one down!
+
+Reported-by: Karol Herbst freedesk...@karolherbst.de
+Reported-by: Tobias Klausmann tobias.klausm...@mni.thm.de
+Signed-off-by: Martin Peres martin.pe...@linux.intel.com
+Tested-by: Martin Peres martin.pe...@linux.intel.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316
+Cc: Ilia Mirkin  imir...@alum.mit.edu
+Cc: Martin Peres martin.pe...@linux.intel.com
+Cc: Olivier Fourdan ofour...@redhat.com
+Cc: Adam Jackson a...@redhat.com
+Cc: Alan Coopersmith alan.coopersm...@oracle.com
+Cc: Chris Wilson ch...@chris-wilson.co.uk
+---
+ os/WaitFor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/os/WaitFor.c b/os/WaitFor.c
+index 431f1a6..993c14e 100644
+--- a/os/WaitFor.c
 b/os/WaitFor.c
+@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady)
+ Bool someReady = FALSE;
+ 
+ FD_ZERO(clientsReadable);
++FD_ZERO(clientsWritable);
+ 
+ if (nready)
+ SmartScheduleStopTimer();
+-- 
+2.4.5
+

diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild
new file mode 100644
index 000..8181fa5
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI=git://anongit.freedesktop.org/git/xorg/xserver
+
+DESCRIPTION=X.Org X servers
+SLOT=0/${PV}
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+
+IUSE_SERVERS=dmx kdrive xephyr xnest xorg xvfb
+IUSE=${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib 
+udev unwind wayland
+
+CDEPEND==app-eselect/eselect-opengl-1.3.0
+   dev-libs/openssl
+   media-libs/freetype
+   =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.46
+   =x11-libs/libpciaccess-0.12.901
+   =x11-libs/libXau-1.0.4
+   =x11-libs/libXdmcp-1.0.2
+