| 1 |
commit: b51d6fe7309a5a4806629fec54162a1cc6fd42bb |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 3 21:43:14 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 21:55:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b51d6fe7 |
| 7 |
|
| 8 |
media-libs/mesa: Add support for libglvnd |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/606924 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/mesa/mesa-19.0.0_rc6.ebuild | 8 +++++--- |
| 14 |
media-libs/mesa/mesa-9999.ebuild | 8 +++++--- |
| 15 |
profiles/base/package.use.mask | 6 +++++- |
| 16 |
3 files changed, 15 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/mesa/mesa-19.0.0_rc6.ebuild b/media-libs/mesa/mesa-19.0.0_rc6.ebuild |
| 19 |
index dd35b9d8a13..0056e74d3ec 100644 |
| 20 |
--- a/media-libs/mesa/mesa-19.0.0_rc6.ebuild |
| 21 |
+++ b/media-libs/mesa/mesa-19.0.0_rc6.ebuild |
| 22 |
@@ -36,9 +36,9 @@ for card in ${VIDEO_CARDS}; do |
| 23 |
done |
| 24 |
|
| 25 |
IUSE="${IUSE_VIDEO_CARDS} |
| 26 |
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors |
| 27 |
- opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau |
| 28 |
- vulkan wayland xa xvmc" |
| 29 |
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +libglvnd +llvm |
| 30 |
+ lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind |
| 31 |
+ vdpau vulkan wayland xa xvmc" |
| 32 |
|
| 33 |
REQUIRED_USE=" |
| 34 |
d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) |
| 35 |
@@ -106,6 +106,7 @@ RDEPEND=" |
| 36 |
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
| 37 |
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
| 38 |
) |
| 39 |
+ libglvnd? ( media-libs/libglvnd ) |
| 40 |
wayland? ( |
| 41 |
>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] |
| 42 |
>=dev-libs/wayland-protocols-1.8 |
| 43 |
@@ -458,6 +459,7 @@ multilib_src_configure() { |
| 44 |
$(meson_use gbm) |
| 45 |
$(meson_use gles1) |
| 46 |
$(meson_use gles2) |
| 47 |
+ $(meson_use libglvnd glvnd) |
| 48 |
$(meson_use selinux) |
| 49 |
-Dvalgrind=$(usex valgrind auto false) |
| 50 |
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") |
| 51 |
|
| 52 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 53 |
index 919f2e68bb2..075bfa0b5a7 100644 |
| 54 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 55 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 56 |
@@ -36,9 +36,9 @@ for card in ${VIDEO_CARDS}; do |
| 57 |
done |
| 58 |
|
| 59 |
IUSE="${IUSE_VIDEO_CARDS} |
| 60 |
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors |
| 61 |
- opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau |
| 62 |
- vulkan wayland xa xvmc" |
| 63 |
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +libglvnd +llvm |
| 64 |
+ lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind |
| 65 |
+ vdpau vulkan wayland xa xvmc" |
| 66 |
|
| 67 |
REQUIRED_USE=" |
| 68 |
d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) |
| 69 |
@@ -106,6 +106,7 @@ RDEPEND=" |
| 70 |
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
| 71 |
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
| 72 |
) |
| 73 |
+ libglvnd? ( media-libs/libglvnd ) |
| 74 |
wayland? ( |
| 75 |
>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] |
| 76 |
>=dev-libs/wayland-protocols-1.8 |
| 77 |
@@ -458,6 +459,7 @@ multilib_src_configure() { |
| 78 |
$(meson_use gbm) |
| 79 |
$(meson_use gles1) |
| 80 |
$(meson_use gles2) |
| 81 |
+ $(meson_use libglvnd glvnd) |
| 82 |
$(meson_use selinux) |
| 83 |
-Dvalgrind=$(usex valgrind auto false) |
| 84 |
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") |
| 85 |
|
| 86 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 87 |
index 861e64519eb..5cb9b0add6b 100644 |
| 88 |
--- a/profiles/base/package.use.mask |
| 89 |
+++ b/profiles/base/package.use.mask |
| 90 |
@@ -7,7 +7,11 @@ |
| 91 |
# This file is only for generic masks. For arch-specific masks (i.e. |
| 92 |
# mask everywhere, unmask on arch/*) use arch/base. |
| 93 |
|
| 94 |
-# Georgy Yakovlev <gyakovlev@g.o> (17 Jan 2019 ) |
| 95 |
+# Matt Turner <mattst88@g.o> (03 Mar 2019) |
| 96 |
+# Mask for testing. Bug 606924 |
| 97 |
+media-libs/mesa libglvnd |
| 98 |
+ |
| 99 |
+# Georgy Yakovlev <gyakovlev@g.o> (17 Jan 2019) |
| 100 |
# Mask openjdk:8 for use as system java-vm until it's proven to work |
| 101 |
dev-java/openjdk:8 gentoo-vm |
| 102 |
dev-java/openjdk-bin:8 gentoo-vm |
Archives