diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-09-24 21:49:20 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-09-24 21:53:07 -0700 |
| commit | d70a6280fedfb61abe722e349c7e4d9aba3124d7 (patch) | |
| tree | 37485af756306951a34e57fff053e9ced4ddd7db /media-libs | |
| parent | media-libs/mesa: Drop old versions (diff) | |
| download | gentoo-d70a6280fedfb61abe722e349c7e4d9aba3124d7.tar.gz gentoo-d70a6280fedfb61abe722e349c7e4d9aba3124d7.tar.bz2 gentoo-d70a6280fedfb61abe722e349c7e4d9aba3124d7.zip | |
media-libs/mesa: Drop IUSE=libglvnd
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index d7ceac80a260..9a49069d0d30 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 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd" @@ -76,14 +76,8 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" RDEPEND=" !app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) gallium? ( unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( @@ -244,7 +238,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 ) + usr/lib/libGLX_mesa.so.0.0.0 )" llvm_check_deps() { @@ -496,13 +490,13 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) + -Dglvnd=enabled -Dshared-glapi=enabled $(meson_feature dri3) $(meson_feature egl) $(meson_feature gbm) $(meson_feature gles1) $(meson_feature gles2) - $(meson_use libglvnd glvnd) $(meson_use selinux) $(meson_feature zstd) -Dvalgrind=$(usex valgrind auto false) @@ -533,14 +527,6 @@ multilib_src_test() { meson test -v -C "${BUILD_DIR}" -t 100 } -pkg_postinst() { - 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 "--") # other args - names of DRI drivers to enable dri_driver_enable() { |