| 1 |
commit: 0dbbd1f476cf6945f112f8e63a90e027f209e4a5 |
| 2 |
Author: Philipp Ammann <philipp.ammann <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Wed Jun 26 19:42:36 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 29 03:44:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbbd1f4 |
| 7 |
|
| 8 |
media-libs/mesa: introduce X USE flag |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/560096 |
| 11 |
Signed-off-by: Philipp Ammann <philipp.ammann <AT> posteo.de> |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/mesa/mesa-9999.ebuild | 30 ++++++++++++++++++------------ |
| 15 |
1 file changed, 18 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 18 |
index d530ead0300..b28120fdcc8 100644 |
| 19 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 20 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 21 |
@@ -38,7 +38,7 @@ done |
| 22 |
IUSE="${IUSE_VIDEO_CARDS} |
| 23 |
+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm |
| 24 |
lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind |
| 25 |
- vdpau vulkan vulkan-overlay wayland xa xvmc" |
| 26 |
+ vdpau vulkan vulkan-overlay wayland +X xa xvmc" |
| 27 |
|
| 28 |
REQUIRED_USE=" |
| 29 |
d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) |
| 30 |
@@ -68,6 +68,8 @@ REQUIRED_USE=" |
| 31 |
video_cards_virgl? ( gallium ) |
| 32 |
video_cards_vivante? ( gallium gbm ) |
| 33 |
video_cards_vmware? ( gallium ) |
| 34 |
+ xa? ( X ) |
| 35 |
+ xvmc? ( X ) |
| 36 |
" |
| 37 |
|
| 38 |
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99" |
| 39 |
@@ -75,13 +77,6 @@ RDEPEND=" |
| 40 |
!app-eselect/eselect-mesa |
| 41 |
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] |
| 42 |
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] |
| 43 |
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] |
| 44 |
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] |
| 45 |
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] |
| 46 |
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] |
| 47 |
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] |
| 48 |
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] |
| 49 |
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}] |
| 50 |
libglvnd? ( |
| 51 |
media-libs/libglvnd[${MULTILIB_USEDEP}] |
| 52 |
!app-eselect/eselect-opengl |
| 53 |
@@ -126,6 +121,15 @@ RDEPEND=" |
| 54 |
) |
| 55 |
video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
| 56 |
vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) |
| 57 |
+ X? ( |
| 58 |
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] |
| 59 |
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] |
| 60 |
+ >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] |
| 61 |
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] |
| 62 |
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] |
| 63 |
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] |
| 64 |
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}] |
| 65 |
+ ) |
| 66 |
" |
| 67 |
for card in ${RADEON_CARDS}; do |
| 68 |
RDEPEND="${RDEPEND} |
| 69 |
@@ -213,8 +217,10 @@ unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} |
| 70 |
|
| 71 |
DEPEND="${RDEPEND} |
| 72 |
valgrind? ( dev-util/valgrind ) |
| 73 |
- x11-libs/libXrandr[${MULTILIB_USEDEP}] |
| 74 |
- x11-base/xorg-proto |
| 75 |
+ X? ( |
| 76 |
+ x11-libs/libXrandr[${MULTILIB_USEDEP}] |
| 77 |
+ x11-base/xorg-proto |
| 78 |
+ ) |
| 79 |
" |
| 80 |
BDEPEND=" |
| 81 |
${PYTHON_DEPS} |
| 82 |
@@ -350,7 +356,7 @@ multilib_src_configure() { |
| 83 |
fi |
| 84 |
fi |
| 85 |
|
| 86 |
- emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) |
| 87 |
+ emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) |
| 88 |
|
| 89 |
if use gallium; then |
| 90 |
emesonargs+=( |
| 91 |
@@ -472,7 +478,7 @@ multilib_src_configure() { |
| 92 |
|
| 93 |
emesonargs+=( |
| 94 |
$(meson_use test build-tests) |
| 95 |
- -Dglx=dri |
| 96 |
+ -Dglx=$(usex X dri disabled) |
| 97 |
-Dshared-glapi=true |
| 98 |
$(meson_use dri3) |
| 99 |
$(meson_use egl) |
Archives