From a5b65c81168c90928784a1e92cda84ed5d6b9eb3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- x11-base/xorg-server/xorg-server-9999.ebuild | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'x11-base/xorg-server/xorg-server-9999.ebuild') diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 3547a7b0742f..c45093888f55 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -14,9 +14,13 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 +CDEPEND="libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -201,7 +205,9 @@ src_install() { pkg_postinst() { if ! use minimal; then # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old + if ! use libglvnd; then + eselect opengl set xorg-x11 --use-old + fi fi } -- cgit v1.2.3 From 5a165c60b9b8c4847067cb83b4be7da785d01f93 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Sep 2019 08:17:07 +0100 Subject: gentoo resync : 28.09.2019 --- x11-base/xorg-server/xorg-server-9999.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'x11-base/xorg-server/xorg-server-9999.ebuild') diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index c45093888f55..ccf5c5da1dbf 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -78,7 +78,7 @@ CDEPEND="libglvnd? ( wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy[egl(+)] - >=dev-libs/wayland-protocols-1.1 + >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( @@ -181,6 +181,12 @@ pkg_setup() { ) } +src_prepare() { + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die + default + eautoreconf +} + src_install() { xorg-3_src_install -- cgit v1.2.3