From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Wed, 13 Jun 2018 00:40:56 +0000 (+0200)
Subject: media-libs/mesa: Support unconditional enabling of drivers
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7469468af8cbb6164977129e6ec5caa4cce256e3;p=gentoo.git

media-libs/mesa: Support unconditional enabling of drivers

... in dri_driver_enable(), gallium_enable(), vulkan_enable().
---

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index afa370713b0f..91b260c97967 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -351,10 +351,10 @@ multilib_src_configure() {
 	fi
 
 	if use gallium; then
-		GALLIUM_DRIVERS+=(swrast)
+		gallium_enable -- swrast
 		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
 	else
-		DRI_DRIVERS+=(swrast)
+		dri_driver_enable -- swrast
 		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
 	fi
 
@@ -457,24 +457,24 @@ pkg_prerm() {
 	fi
 }
 
-# $1 - VIDEO_CARDS flag
+# $1 - VIDEO_CARDS flag (check skipped for "--")
 # other args - names of DRI drivers to enable
 dri_driver_enable() {
-	if use $1; then
+	if [[ $1 == -- ]] || use $1; then
 		shift
 		DRI_DRIVERS+=("$@")
 	fi
 }
 
 gallium_enable() {
-	if use $1; then
+	if [[ $1 == -- ]] || use $1; then
 		shift
 		GALLIUM_DRIVERS+=("$@")
 	fi
 }
 
 vulkan_enable() {
-	if use $1; then
+	if [[ $1 == -- ]] || use $1; then
 		shift
 		VULKAN_DRIVERS+=("$@")
 	fi