diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-28 08:17:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-28 08:17:07 +0100 |
commit | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (patch) | |
tree | 166b01591366d3479084ea774c888bc84aaa8d4f /media-libs/mesa/mesa-9999.ebuild | |
parent | a5b65c81168c90928784a1e92cda84ed5d6b9eb3 (diff) |
gentoo resync : 28.09.2019
Diffstat (limited to 'media-libs/mesa/mesa-9999.ebuild')
-rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index b7b3a5803880..27301deb54b0 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc" @@ -77,7 +77,7 @@ RDEPEND=" >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] libglvnd? ( - media-libs/libglvnd[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}] !app-eselect/eselect-opengl ) !libglvnd? ( @@ -243,6 +243,7 @@ x86? ( usr/lib*/libGLESv2.so.2.0.0 usr/lib*/libGL.so.1.2.0 usr/lib*/libOSMesa.so.8.0.0 + libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) )" llvm_check_deps() { @@ -503,6 +504,8 @@ multilib_src_compile() { multilib_src_install() { meson_src_install + + use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc } multilib_src_install_all() { @@ -514,9 +517,11 @@ multilib_src_test() { } pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} + if ! use libglvnd; then + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + fi } # $1 - VIDEO_CARDS flag (check skipped for "--") |