commit:     3a4de1a00cc1f5de3feb0956bccf7b5cd908f921
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 00:56:41 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 01:34:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4de1a0

media-libs/mesa: Always specify -Dplatforms=...

Otherwise it will default to -Dplatforms=auto, which includes Wayland.
Many thanks to Jan Burgmeier for debugging the issue and providing the
fix.

Closes: https://bugs.gentoo.org/759139
Closes: https://bugs.gentoo.org/759319
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/mesa-20.2.4.ebuild | 2 +-
 media-libs/mesa/mesa-20.2.6.ebuild | 2 +-
 media-libs/mesa/mesa-20.3.2.ebuild | 2 +-
 media-libs/mesa/mesa-9999.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-20.2.4.ebuild 
b/media-libs/mesa/mesa-20.2.4.ebuild
index ca0dfceda9d..a9abb722e3f 100644
--- a/media-libs/mesa/mesa-20.2.4.ebuild
+++ b/media-libs/mesa/mesa-20.2.4.ebuild
@@ -369,7 +369,7 @@ multilib_src_configure() {
        local platforms
        use X && platforms+="x11"
        use wayland && platforms+=",wayland"
-       [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+       emesonargs+=(-Dplatforms=${platforms#,})
 
        if use X || use egl; then
                emesonargs+=(-Dglvnd=true)

diff --git a/media-libs/mesa/mesa-20.2.6.ebuild 
b/media-libs/mesa/mesa-20.2.6.ebuild
index 87cd6143479..3a059a995dd 100644
--- a/media-libs/mesa/mesa-20.2.6.ebuild
+++ b/media-libs/mesa/mesa-20.2.6.ebuild
@@ -369,7 +369,7 @@ multilib_src_configure() {
        local platforms
        use X && platforms+="x11"
        use wayland && platforms+=",wayland"
-       [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+       emesonargs+=(-Dplatforms=${platforms#,})
 
        if use X || use egl; then
                emesonargs+=(-Dglvnd=true)

diff --git a/media-libs/mesa/mesa-20.3.2.ebuild 
b/media-libs/mesa/mesa-20.3.2.ebuild
index 4a9d566b07c..3a23ce15ad2 100644
--- a/media-libs/mesa/mesa-20.3.2.ebuild
+++ b/media-libs/mesa/mesa-20.3.2.ebuild
@@ -370,7 +370,7 @@ multilib_src_configure() {
        local platforms
        use X && platforms+="x11"
        use wayland && platforms+=",wayland"
-       [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+       emesonargs+=(-Dplatforms=${platforms#,})
 
        if use X || use egl; then
                emesonargs+=(-Dglvnd=true)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 152e9ea51a8..1a2ca6e33b8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -374,7 +374,7 @@ multilib_src_configure() {
        local platforms
        use X && platforms+="x11"
        use wayland && platforms+=",wayland"
-       [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
+       emesonargs+=(-Dplatforms=${platforms#,})
 
        if use X || use egl; then
                emesonargs+=(-Dglvnd=true)

Reply via email to