commit: 8d462cceb526ad5500b58de2ad571ffee4fd505c Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Dec 1 23:00:37 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Dec 1 23:05:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d462cce
media-libs/mesa: Allow building with USE="-X -egl" Closes: https://bugs.gentoo.org/739598 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/mesa/mesa-20.3.0_rc3.ebuild | 7 ++++++- media-libs/mesa/mesa-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/media-libs/mesa/mesa-20.3.0_rc3.ebuild b/media-libs/mesa/mesa-20.3.0_rc3.ebuild index 7326bb94a60..17952ddce99 100644 --- a/media-libs/mesa/mesa-20.3.0_rc3.ebuild +++ b/media-libs/mesa/mesa-20.3.0_rc3.ebuild @@ -372,6 +372,12 @@ multilib_src_configure() { use wayland && platforms+=",wayland" [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) + if use X || use egl; then + emesonargs+=(-Dglvnd=true) + else + emesonargs+=(-Dglvnd=false) + fi + if use gallium; then emesonargs+=( $(meson_feature llvm) @@ -492,7 +498,6 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) - -Dglvnd=true -Dshared-glapi=enabled $(meson_feature dri3) $(meson_feature egl) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 72ea1d60ab5..2e217a5233a 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -371,6 +371,12 @@ multilib_src_configure() { use wayland && platforms+=",wayland" [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) + if use X || use egl; then + emesonargs+=(-Dglvnd=true) + else + emesonargs+=(-Dglvnd=false) + fi + if use gallium; then emesonargs+=( $(meson_feature llvm) @@ -491,7 +497,6 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) - -Dglvnd=true -Dshared-glapi=enabled $(meson_feature dri3) $(meson_feature egl)
