diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.7-r10.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.6-r314.ebuild) | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 6f02874f..4997e1ca 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1 @@ -DIST xorg-server-1.20.6.tar.bz2 6298697 BLAKE2B 30e505cf83bb2b20e17533b89b81521d029412ea6bd804ecf20458af20364172eb7b21561f14c885d5e16597e6d09985b255b6cec2beb30662658d9e316bc953 SHA512 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 +DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 diff --git a/x11-base/xorg-server/xorg-server-1.20.6-r314.ebuild b/x11-base/xorg-server/xorg-server-1.20.7-r10.ebuild index 19a511b1..1300f1fa 100644 --- a/x11-base/xorg-server/xorg-server-1.20.6-r314.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.7-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -67,14 +67,14 @@ CDEPEND="libglvnd? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] - media-libs/libepoxy[X,egl(+)] + >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 - media-libs/libepoxy[egl(+)] - >=dev-libs/wayland-protocols-1.1 + >=media-libs/libepoxy-1.5.4[egl(+)] + >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( @@ -180,6 +180,15 @@ pkg_setup() { ) } +src_configure() { + # Needed since commit 2a1a96d956f4 ("glamor: Add a function to get the + # driver name via EGL_MESA_query_driver") neglected to add autotools + # support + append-cflags -DGLAMOR_HAS_EGL_QUERY_DRIVER + + xorg-3_src_configure +} + src_install() { xorg-3_src_install @@ -202,6 +211,7 @@ src_install() { insinto /usr/share/X11/xorg.conf.d doins "${FILESDIR}"/99-synaptics-overrides.conf + find "${ED}"/var -type d -empty -delete || die } |