| 1 |
commit: 8d462cceb526ad5500b58de2ad571ffee4fd505c |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 1 23:00:37 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 1 23:05:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d462cce |
| 7 |
|
| 8 |
media-libs/mesa: Allow building with USE="-X -egl" |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/739598 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/mesa/mesa-20.3.0_rc3.ebuild | 7 ++++++- |
| 14 |
media-libs/mesa/mesa-9999.ebuild | 7 ++++++- |
| 15 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/mesa/mesa-20.3.0_rc3.ebuild b/media-libs/mesa/mesa-20.3.0_rc3.ebuild |
| 18 |
index 7326bb94a60..17952ddce99 100644 |
| 19 |
--- a/media-libs/mesa/mesa-20.3.0_rc3.ebuild |
| 20 |
+++ b/media-libs/mesa/mesa-20.3.0_rc3.ebuild |
| 21 |
@@ -372,6 +372,12 @@ multilib_src_configure() { |
| 22 |
use wayland && platforms+=",wayland" |
| 23 |
[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) |
| 24 |
|
| 25 |
+ if use X || use egl; then |
| 26 |
+ emesonargs+=(-Dglvnd=true) |
| 27 |
+ else |
| 28 |
+ emesonargs+=(-Dglvnd=false) |
| 29 |
+ fi |
| 30 |
+ |
| 31 |
if use gallium; then |
| 32 |
emesonargs+=( |
| 33 |
$(meson_feature llvm) |
| 34 |
@@ -492,7 +498,6 @@ multilib_src_configure() { |
| 35 |
emesonargs+=( |
| 36 |
$(meson_use test build-tests) |
| 37 |
-Dglx=$(usex X dri disabled) |
| 38 |
- -Dglvnd=true |
| 39 |
-Dshared-glapi=enabled |
| 40 |
$(meson_feature dri3) |
| 41 |
$(meson_feature egl) |
| 42 |
|
| 43 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 44 |
index 72ea1d60ab5..2e217a5233a 100644 |
| 45 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 46 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 47 |
@@ -371,6 +371,12 @@ multilib_src_configure() { |
| 48 |
use wayland && platforms+=",wayland" |
| 49 |
[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) |
| 50 |
|
| 51 |
+ if use X || use egl; then |
| 52 |
+ emesonargs+=(-Dglvnd=true) |
| 53 |
+ else |
| 54 |
+ emesonargs+=(-Dglvnd=false) |
| 55 |
+ fi |
| 56 |
+ |
| 57 |
if use gallium; then |
| 58 |
emesonargs+=( |
| 59 |
$(meson_feature llvm) |
| 60 |
@@ -491,7 +497,6 @@ multilib_src_configure() { |
| 61 |
emesonargs+=( |
| 62 |
$(meson_use test build-tests) |
| 63 |
-Dglx=$(usex X dri disabled) |
| 64 |
- -Dglvnd=true |
| 65 |
-Dshared-glapi=enabled |
| 66 |
$(meson_feature dri3) |
| 67 |
$(meson_feature egl) |
Archives