| 1 |
commit: c1423568da90a84b85d32e7cbb0456ca00118caa |
| 2 |
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 4 10:46:53 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 6 23:30:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1423568 |
| 7 |
|
| 8 |
media-libs/mesa: Fix vulkan overlay mesa flags |
| 9 |
|
| 10 |
These flags were changed to be in a list variable instead of individual |
| 11 |
meson flags. |
| 12 |
|
| 13 |
Mesa commit: |
| 14 |
https://gitlab.freedesktop.org/mesa/mesa/-/commit/54fe5b0482df0f066384b274796d4081c2a1968c |
| 15 |
|
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/21518 |
| 17 |
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com> |
| 18 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 19 |
|
| 20 |
media-libs/mesa/mesa-21.1.4.ebuild | 7 +++++-- |
| 21 |
media-libs/mesa/mesa-9999.ebuild | 7 +++++-- |
| 22 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 23 |
|
| 24 |
diff --git a/media-libs/mesa/mesa-21.1.4.ebuild b/media-libs/mesa/mesa-21.1.4.ebuild |
| 25 |
index 892e0707669..635fc07d42b 100644 |
| 26 |
--- a/media-libs/mesa/mesa-21.1.4.ebuild |
| 27 |
+++ b/media-libs/mesa/mesa-21.1.4.ebuild |
| 28 |
@@ -501,6 +501,11 @@ multilib_src_configure() { |
| 29 |
echo "${drivers//$'\n'/,}" |
| 30 |
} |
| 31 |
|
| 32 |
+ local vulkan_layers |
| 33 |
+ use vulkan && vulkan_layers+="device-select" |
| 34 |
+ use vulkan-overlay && vulkan_layers+=",overlay" |
| 35 |
+ emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) |
| 36 |
+ |
| 37 |
emesonargs+=( |
| 38 |
$(meson_use test build-tests) |
| 39 |
-Dglx=$(usex X dri disabled) |
| 40 |
@@ -517,8 +522,6 @@ multilib_src_configure() { |
| 41 |
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") |
| 42 |
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") |
| 43 |
-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") |
| 44 |
- $(meson_use vulkan vulkan-device-select-layer) |
| 45 |
- $(meson_use vulkan-overlay vulkan-overlay-layer) |
| 46 |
--buildtype $(usex debug debug plain) |
| 47 |
-Db_ndebug=$(usex debug false true) |
| 48 |
) |
| 49 |
|
| 50 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 51 |
index caf150f61b6..b3ab8d6070d 100644 |
| 52 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 53 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 54 |
@@ -498,6 +498,11 @@ multilib_src_configure() { |
| 55 |
echo "${drivers//$'\n'/,}" |
| 56 |
} |
| 57 |
|
| 58 |
+ local vulkan_layers |
| 59 |
+ use vulkan && vulkan_layers+="device-select" |
| 60 |
+ use vulkan-overlay && vulkan_layers+=",overlay" |
| 61 |
+ emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) |
| 62 |
+ |
| 63 |
emesonargs+=( |
| 64 |
$(meson_use test build-tests) |
| 65 |
-Dglx=$(usex X dri disabled) |
| 66 |
@@ -514,8 +519,6 @@ multilib_src_configure() { |
| 67 |
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") |
| 68 |
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") |
| 69 |
-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") |
| 70 |
- $(meson_use vulkan vulkan-device-select-layer) |
| 71 |
- $(meson_use vulkan-overlay vulkan-overlay-layer) |
| 72 |
--buildtype $(usex debug debug plain) |
| 73 |
-Db_ndebug=$(usex debug false true) |
| 74 |
) |
Archives