summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-12-01 18:00:37 -0500
committerMatt Turner <mattst88@gentoo.org>2020-12-01 18:05:51 -0500
commit8d462cceb526ad5500b58de2ad571ffee4fd505c (patch)
tree6882732d0928884b4697dca4d8aee85fc5a5ab3a /media-libs
parentmedia-libs/mesa: Avoid deprecation warning (diff)
downloadgentoo-8d462cceb526ad5500b58de2ad571ffee4fd505c.tar.gz
gentoo-8d462cceb526ad5500b58de2ad571ffee4fd505c.tar.bz2
gentoo-8d462cceb526ad5500b58de2ad571ffee4fd505c.zip
media-libs/mesa: Allow building with USE="-X -egl"
Closes: https://bugs.gentoo.org/739598 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/mesa/mesa-20.3.0_rc3.ebuild7
-rw-r--r--media-libs/mesa/mesa-9999.ebuild7
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 7326bb94a600..17952ddce99e 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 72ea1d60ab56..2e217a5233af 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)