commit: fce28df7e8304ff4b93b1c194a1f8cb76876b571 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Fri Jul 10 00:12:25 2020 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Fri Jul 10 00:16:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce28df7
media-libs/vulkan-loader: become sysroot-aware This allows building in a sysroot without using the headers installed on the host. Closes: https://bugs.gentoo.org/731112 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16655 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> .../{vulkan-loader-9999.ebuild => vulkan-loader-1.2.137-r1.ebuild} | 4 ++-- .../{vulkan-loader-9999.ebuild => vulkan-loader-1.2.141-r1.ebuild} | 6 +++--- media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137-r1.ebuild similarity index 95% copy from media-libs/vulkan-loader/vulkan-loader-9999.ebuild copy to media-libs/vulkan-loader/vulkan-loader-1.2.137-r1.ebuild index f6e5a7abb27..3a00275c7e7 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137-r1.ebuild @@ -27,7 +27,7 @@ IUSE="layers wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND="${PYTHON_DEPS} - >=dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-headers-1.2.137 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] @@ -49,7 +49,7 @@ multilib_src_configure() { -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) cmake_src_configure } diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild similarity index 92% copy from media-libs/vulkan-loader/vulkan-loader-9999.ebuild copy to media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild index f6e5a7abb27..ab1106326d2 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -27,7 +27,7 @@ IUSE="layers wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND="${PYTHON_DEPS} - >=dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-headers-1.2.143 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] @@ -49,7 +49,7 @@ multilib_src_configure() { -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) cmake_src_configure } diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index f6e5a7abb27..c09d888cf7a 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -49,7 +49,7 @@ multilib_src_configure() { -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) cmake_src_configure }
