commit:     6a92ea7c1d3352394094f47440f6dd2645b4d3da
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 19:45:12 2016 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 19:54:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a92ea7c

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

With only USE=osmesa, build the classic OSMesa.

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

 media-libs/mesa/mesa-9999.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3a58ccc..8785e9d 100644
--- 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} \

Reply via email to