commit:     98d377e7f4358ae609320367237e137da8355984
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 00:32:31 2021 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 00:34:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d377e7

media-libs/vulkan-layers: Fix header install path

Closes: https://bugs.gentoo.org/827494
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../{vulkan-layers-9999.ebuild => vulkan-layers-1.2.198-r1.ebuild}    | 4 ++--
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild 
b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
similarity index 92%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
index ecfbe9b339e3..8620262391de 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        dev-cpp/robin-hood-hashing
@@ -50,7 +50,7 @@ multilib_src_configure() {
                -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
                -DBUILD_TESTS=OFF
                -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-               -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+               -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
                -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
        )
        cmake_src_configure

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild 
b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index ecfbe9b339e3..5beaf4f6dc7a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -50,7 +50,7 @@ multilib_src_configure() {
                -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
                -DBUILD_TESTS=OFF
                -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-               -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+               -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
                -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
        )
        cmake_src_configure

Reply via email to