[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

[Matt Turner]

commit:     7469468af8cbb6164977129e6ec5caa4cce256e3
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Jun 13 00:40:56 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 16:39:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7469468a

media-libs/mesa: Support unconditional enabling of drivers

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

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

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index afa370713b0..91b260c9796 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