diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2021-07-04 12:46:53 +0200 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2021-07-06 16:30:13 -0700 |
commit | c1423568da90a84b85d32e7cbb0456ca00118caa (patch) | |
tree | efb9d09e5c362eb136d5d0823192df401acdd768 /media-libs | |
parent | dev-python/PyQt-builder: remove 1.10.1-r1 (diff) | |
download | gentoo-c1423568da90a84b85d32e7cbb0456ca00118caa.tar.gz gentoo-c1423568da90a84b85d32e7cbb0456ca00118caa.tar.bz2 gentoo-c1423568da90a84b85d32e7cbb0456ca00118caa.zip |
media-libs/mesa: Fix vulkan overlay mesa flags
These flags were changed to be in a list variable instead of individual
meson flags.
Mesa commit:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/54fe5b0482df0f066384b274796d4081c2a1968c
Closes: https://github.com/gentoo/gentoo/pull/21518
Signed-off-by: Sebastian Parborg <darkdefende@gmail.com>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/mesa/mesa-21.1.4.ebuild | 7 | ||||
-rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-libs/mesa/mesa-21.1.4.ebuild b/media-libs/mesa/mesa-21.1.4.ebuild index 892e07076698..635fc07d42b0 100644 --- a/media-libs/mesa/mesa-21.1.4.ebuild +++ b/media-libs/mesa/mesa-21.1.4.ebuild @@ -501,6 +501,11 @@ multilib_src_configure() { echo "${drivers//$'\n'/,}" } + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) @@ -517,8 +522,6 @@ multilib_src_configure() { -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) --buildtype $(usex debug debug plain) -Db_ndebug=$(usex debug false true) ) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index caf150f61b60..b3ab8d6070d6 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -498,6 +498,11 @@ multilib_src_configure() { echo "${drivers//$'\n'/,}" } + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) @@ -514,8 +519,6 @@ multilib_src_configure() { -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) --buildtype $(usex debug debug plain) -Db_ndebug=$(usex debug false true) ) |