commit: 16926d041311af9fee3f598247bb7fe4751afc1f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 11 20:06:37 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Mar 15 21:28:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16926d04
media-libs/vulkan-loader: 9999 cleanup, cmake.eclass, >=cmake-3.10.2 Drop superfluous COMMON_DEPEND, other ebuild style improvements, sorting Bug: https://bugs.gentoo.org/712090 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 37 ++++++++++------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index 8d64aee32dd..95a585496af 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -2,27 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +MY_PN=Vulkan-Loader +CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{6,7} ) +inherit cmake-multilib python-any-r1 toolchain-funcs -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"; +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"; EGIT_SUBMODULES=() inherit git-r3 else - 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 + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~ppc64 ~x86" - SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${MY_P} + S="${WORKDIR}"/${MY_PN}-${PV} fi -inherit toolchain-funcs python-any-r1 cmake-multilib - DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"; @@ -30,14 +25,16 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="layers wayland X" -PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" +BDEPEND=">=dev-util/cmake-3.10.2" DEPEND="${PYTHON_DEPS} >=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 @@ -46,21 +43,21 @@ multilib_src_configure() { fi local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LOADER=True + -DCMAKE_SKIP_RPATH=ON + -DBUILD_TESTS=OFF + -DBUILD_LOADER=ON -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) -DVULKAN_HEADERS_INSTALL_DIR="/usr" ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_install() { keepdir /etc/vulkan/icd.d - cmake-utils_src_install + cmake_src_install } pkg_postinst() {
