From: Matt Turner <mattst88@gentoo.org>
Date: Sun, 8 Mar 2020 23:57:08 +0000 (-0700)
Subject: media-libs/mesa: Make X11 the primary EGL platform
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=406bd0caa2e11ef228a96d38c14550594bf424be;p=gentoo.git

media-libs/mesa: Make X11 the primary EGL platform

Closes: https://bugs.gentoo.org/711516
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/media-libs/mesa/mesa-19.3.4.ebuild b/media-libs/mesa/mesa-19.3.4-r1.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-19.3.4.ebuild
rename to media-libs/mesa/mesa-19.3.4-r1.ebuild
index 78bbe80db9e8..ea716c993c10 100644
--- a/media-libs/mesa/mesa-19.3.4.ebuild
+++ b/media-libs/mesa/mesa-19.3.4-r1.ebuild
@@ -355,7 +355,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
 
 	if use gallium; then
 		emesonargs+=(
diff --git a/media-libs/mesa/mesa-20.0.1.ebuild b/media-libs/mesa/mesa-20.0.1-r1.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-20.0.1.ebuild
rename to media-libs/mesa/mesa-20.0.1-r1.ebuild
index 8805749d430f..8997f8d06a37 100644
--- a/media-libs/mesa/mesa-20.0.1.ebuild
+++ b/media-libs/mesa/mesa-20.0.1-r1.ebuild
@@ -356,7 +356,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
 
 	if use gallium; then
 		emesonargs+=(
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7210761bb621..d62167360742 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -357,7 +357,7 @@ multilib_src_configure() {
 		fi
 	fi
 
-	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
 
 	if use gallium; then
 		emesonargs+=(