media-libs/mesa: Add support for libglvnd

Bug: https://bugs.gentoo.org/606924
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/media-libs/mesa/mesa-19.0.0_rc6.ebuild b/media-libs/mesa/mesa-19.0.0_rc6.ebuild
index dd35b9d8a1363c23926f837137d69949cc464034..0056e74d3ec042ec45cbdc9720aa8371dd64f9ce 100644 (file)
--- a/media-libs/mesa/mesa-19.0.0_rc6.ebuild
+++ b/media-libs/mesa/mesa-19.0.0_rc6.ebuild
@@ -36,9 +36,9 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-       opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-       vulkan wayland xa xvmc"
+       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +libglvnd +llvm
+       lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+       vdpau vulkan wayland xa xvmc"
 
 REQUIRED_USE="
        d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -106,6 +106,7 @@ RDEPEND="
                vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
                xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
        )
+       libglvnd? ( media-libs/libglvnd )
        wayland? (
                >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
                >=dev-libs/wayland-protocols-1.8
@@ -458,6 +459,7 @@ multilib_src_configure() {
                $(meson_use gbm)
                $(meson_use gles1)
                $(meson_use gles2)
+               $(meson_use libglvnd glvnd)
                $(meson_use selinux)
                -Dvalgrind=$(usex valgrind auto false)
                -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 919f2e68bb281837e9cc40386cee66d9beaa8983..075bfa0b5a7c93805a39520224ae5531acb643e4 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -36,9 +36,9 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-       opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-       vulkan wayland xa xvmc"
+       +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +libglvnd +llvm
+       lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+       vdpau vulkan wayland xa xvmc"
 
 REQUIRED_USE="
        d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -106,6 +106,7 @@ RDEPEND="
                vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
                xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
        )
+       libglvnd? ( media-libs/libglvnd )
        wayland? (
                >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
                >=dev-libs/wayland-protocols-1.8
@@ -458,6 +459,7 @@ multilib_src_configure() {
                $(meson_use gbm)
                $(meson_use gles1)
                $(meson_use gles2)
+               $(meson_use libglvnd glvnd)
                $(meson_use selinux)
                -Dvalgrind=$(usex valgrind auto false)
                -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 861e64519eba70c31979e40b6c9666875ab7a0fe..5cb9b0add6b545acf0275aa8f351f52bc173bc8d 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,7 +7,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (17 Jan 2019 )
+# Matt Turner <mattst88@gentoo.org> (03 Mar 2019)
+# Mask for testing. Bug 606924
+media-libs/mesa libglvnd
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (17 Jan 2019)
 # Mask openjdk:8 for use as system java-vm until it's proven to work
 dev-java/openjdk:8 gentoo-vm
 dev-java/openjdk-bin:8 gentoo-vm