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 186D8138334 for ; Wed, 11 Jul 2018 01:06:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3282DE085E; Wed, 11 Jul 2018 01:06:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 F3284E085E for ; Wed, 11 Jul 2018 01:05:59 +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 D1501335CB2 for ; Wed, 11 Jul 2018 01:05:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBE62300 for ; Wed, 11 Jul 2018 01:05:55 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1531271143.b3ca4207cb43e5a5b2daf2376a838688951d698b.sarnex@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-1.1.77.0-r1.ebuild X-VCS-Directories: dev-util/vulkan-tools/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: b3ca4207cb43e5a5b2daf2376a838688951d698b X-VCS-Branch: master Date: Wed, 11 Jul 2018 01:05:55 +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-Archives-Salt: 7de9b7fe-a3f2-4e26-b3e4-8fd082421482 X-Archives-Hash: 6abb3ffd98973f2003861651661a5267 commit: b3ca4207cb43e5a5b2daf2376a838688951d698b Author: Nick Sarnie gentoo org> AuthorDate: Wed Jul 11 01:03:51 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Wed Jul 11 01:05:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ca4207 dev-util/vulkan-tools: Rename cube and cubepp demos Fixes: https://bugs.gentoo.org/660770 Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild new file mode 100644 index 00000000000..fcd605b2064 --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" +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="X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -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" + ) + cmake-utils_src_configure +} + +multilib_src_install() { + default + mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die + mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die +} + +pkg_postinst() { + einfo "The cube and cubepp demos have been renamed to" + einfo "vulkancube and vulkancubecpp to prevent collisions" +}