From: Matt Turner <mattst88@gentoo.org>
Date: Tue, 9 Feb 2016 19:45:12 +0000 (-0800)
Subject: media-libs/mesa: Build gallium-osmesa when USE="gallium osmesa"
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a92ea7c1d3352394094f47440f6dd2645b4d3da;p=gentoo.git

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 3a58ccc2d790..8785e9d870e7 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} \