From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49E86138350 for ; Sun, 15 Mar 2020 21:29:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87E85E1140; Sun, 15 Mar 2020 21:29:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C1B7E1140 for ; Sun, 15 Mar 2020 21:29:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54E2934F198 for ; Sun, 15 Mar 2020 21:29:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F09E318C for ; Sun, 15 Mar 2020 21:28:56 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1584307718.7abebfc584b5318e3b7dda4c6aedc176dec2b62e.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/vulkan-tools/vulkan-tools-9999.ebuild X-VCS-Directories: dev-util/vulkan-tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7abebfc584b5318e3b7dda4c6aedc176dec2b62e X-VCS-Branch: master Date: Sun, 15 Mar 2020 21:28:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 75adaaeb-d315-43f0-825e-bbe842fea812 X-Archives-Hash: 038354f1ae44d2a3c5d85053bab3ca6a commit: 7abebfc584b5318e3b7dda4c6aedc176dec2b62e Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 11 19:14:27 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 15 21:28:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abebfc5 dev-util/vulkan-tools: 9999 cleanup, cmake.eclass, >=cmake-3.10.2 Drop superfluous COMMON_DEPEND, other ebuild style improvements, sorting Use upstream tarball instead of error-prone EGIT_COMMIT Pin dev-util/vulkan-{headers,loader} to >=${PV}, maintainability again Bug: https://bugs.gentoo.org/712090 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> Signed-off-by: Matt Turner gentoo.org> dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 55 ++++++++++++++------------ 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 70535b3958e..57cd7f76737 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -2,44 +2,49 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +MY_PN=Vulkan-Tools +CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{6,7} ) +inherit cmake-multilib python-any-r1 -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9" + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~ppc64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" + S="${WORKDIR}"/${MY_PN}-${PV} fi -inherit python-any-r1 cmake-multilib - DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="+cube +vulkaninfo +X wayland" -COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?] - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - )" - -BDEPEND="${PYTHON_DEPS} - cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )" -DEPEND=">=dev-util/vulkan-headers-1.1.125 - ${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" +IUSE="+cube +vulkaninfo wayland +X" # Vulkaninfo does not support wayland REQUIRED_USE="|| ( X wayland ) vulkaninfo? ( X )" +BDEPEND="${PYTHON_DEPS} + >=dev-util/cmake-3.10.2 + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + >=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + >=dev-util/vulkan-headers-${PV} +" + pkg_setup() { MULTILIB_CHOST_TOOLS=() @@ -59,14 +64,14 @@ pkg_setup() { multilib_src_configure() { local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True + -DCMAKE_SKIP_RPATH=ON -DBUILD_CUBE=$(usex cube) -DBUILD_VULKANINFO=$(usex vulkaninfo) -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DGLSLANG_INSTALL_DIR="/usr" - -DVULKAN_HEADERS_INSTALL_DIR="/usr" + -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" + -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" ) # Upstream only supports one window system at a time @@ -86,9 +91,9 @@ multilib_src_configure() { ) fi - cmake-utils_src_configure + cmake_src_configure } multilib_src_install() { - cmake-utils_src_install + cmake_src_install }