commit: 339ec5f0c3caddeb14c143f8f61612356794e536 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Tue May 26 21:47:03 2020 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Tue May 26 21:47:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339ec5f0
media-libs/vulkan-loader: Fix deps Closes: https://bugs.gentoo.org/724870 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> ....133.ebuild => vulkan-loader-1.1.125-r1.ebuild} | 41 ++++++++++++---------- .../vulkan-loader/vulkan-loader-1.2.133.ebuild | 2 +- .../vulkan-loader/vulkan-loader-1.2.135.ebuild | 2 +- .../vulkan-loader/vulkan-loader-1.2.137.ebuild | 2 +- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild similarity index 65% copy from media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild copy to media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild index 60deb31aa07..703cf7774d1 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild @@ -2,22 +2,27 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) -MY_PN=Vulkan-Loader -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-multilib python-any-r1 toolchain-funcs - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"; +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"; EGIT_SUBMODULES=() inherit git-r3 else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + if [[ -z ${SNAPSHOT_COMMIT} ]]; then + MY_PV=v${PV} + MY_P=Vulkan-Loader-${PV} + else + MY_PV=${SNAPSHOT_COMMIT} + MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT} + fi KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}"/${MY_PN}-${PV} + SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${MY_P} fi +inherit toolchain-funcs python-any-r1 cmake-multilib + DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"; @@ -25,16 +30,14 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="layers wayland X" -BDEPEND=">=dev-util/cmake-3.10.2" +PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} - >=dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-headers-${PV} wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" -PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" + )" multilib_src_configure() { # Integrated clang assembler doesn't work with x86 - Bug #698164 @@ -43,21 +46,21 @@ multilib_src_configure() { fi local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DBUILD_TESTS=OFF - -DBUILD_LOADER=ON + -DCMAKE_SKIP_RPATH=True + -DBUILD_TESTS=False + -DBUILD_LOADER=True -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" ) - cmake_src_configure + cmake-utils_src_configure } multilib_src_install() { keepdir /etc/vulkan/icd.d - cmake_src_install + cmake-utils_src_install } pkg_postinst() { diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild index 60deb31aa07..33cdb2c5384 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.133.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-${PV} wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild index 313f090553b..45a674083b0 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild @@ -27,7 +27,7 @@ IUSE="layers wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND="${PYTHON_DEPS} - >=dev-util/vulkan-headers-1.2.136 + ~dev-util/vulkan-headers-1.2.136 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild index d47301d0d52..0c346926f2c 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild @@ -27,7 +27,7 @@ IUSE="layers wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND="${PYTHON_DEPS} - >=dev-util/vulkan-headers-1.2.137 + ~dev-util/vulkan-headers-1.2.137 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}]
