media-libs/mesa: Build gallium-osmesa when USE="gallium osmesa"

With only USE=osmesa, build the classic OSMesa.

Bug: https://bugs.gentoo.org/574070

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3a58ccc2d790083ccd0964647c8d48823f30b54f..8785e9d870e76d5bb9c7fd8091d67c7463fdf7ac 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -274,6 +274,12 @@ multilib_src_configure() {
                myconf+=" --disable-asm"
        fi
 
+       if use gallium; then
+               myconf+=" $(use_enable osmesa gallium-osmesa)"
+       else
+               myconf+=" $(use_enable osmesa)"
+       fi
+
        # build fails with BSD indent, bug #428112
        use userland_GNU || export INDENT=cat
 
@@ -292,7 +298,6 @@ multilib_src_configure() {
                $(use_enable gles1) \
                $(use_enable gles2) \
                $(use_enable nptl glx-tls) \
-               $(use_enable osmesa) \
                $(use_enable !udev sysfs) \
                --enable-llvm-shared-libs \
                --with-dri-drivers=${DRI_DRIVERS} \