commit: 0dbbd1f476cf6945f112f8e63a90e027f209e4a5 Author: Philipp Ammann <philipp.ammann <AT> posteo <DOT> de> AuthorDate: Wed Jun 26 19:42:36 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Jul 29 03:44:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbbd1f4
media-libs/mesa: introduce X USE flag Bug: https://bugs.gentoo.org/560096 Signed-off-by: Philipp Ammann <philipp.ammann <AT> posteo.de> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/mesa/mesa-9999.ebuild | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index d530ead0300..b28120fdcc8 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -38,7 +38,7 @@ done IUSE="${IUSE_VIDEO_CARDS} +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 xa xvmc" + vdpau vulkan vulkan-overlay wayland +X xa xvmc" REQUIRED_USE=" d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) @@ -68,6 +68,8 @@ REQUIRED_USE=" video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) " LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99" @@ -75,13 +77,6 @@ RDEPEND=" !app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] libglvnd? ( media-libs/libglvnd[${MULTILIB_USEDEP}] !app-eselect/eselect-opengl @@ -126,6 +121,15 @@ RDEPEND=" ) video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + ) " for card in ${RADEON_CARDS}; do RDEPEND="${RDEPEND} @@ -213,8 +217,10 @@ unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind ) - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-base/xorg-proto + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) " BDEPEND=" ${PYTHON_DEPS} @@ -350,7 +356,7 @@ multilib_src_configure() { fi fi - emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) + emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) if use gallium; then emesonargs+=( @@ -472,7 +478,7 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) - -Dglx=dri + -Dglx=$(usex X dri disabled) -Dshared-glapi=true $(meson_use dri3) $(meson_use egl)
