Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/
Date: Wed, 11 Jul 2018 01:06:03
Message-Id: 1531271143.b3ca4207cb43e5a5b2daf2376a838688951d698b.sarnex@gentoo
1 commit: b3ca4207cb43e5a5b2daf2376a838688951d698b
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 11 01:03:51 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 11 01:05:43 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ca4207
7
8 dev-util/vulkan-tools: Rename cube and cubepp demos
9
10 Fixes: https://bugs.gentoo.org/660770
11 Package-Manager: Portage-2.3.41, Repoman-2.3.9
12
13 .../vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild | 61 ++++++++++++++++++++++
14 1 file changed, 61 insertions(+)
15
16 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
17 new file mode 100644
18 index 00000000000..fcd605b2064
19 --- /dev/null
20 +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
21 @@ -0,0 +1,61 @@
22 +# Copyright 1999-2018 Gentoo Foundation
23 +# Distributed under the terms of the GNU General Public License v2
24 +
25 +EAPI=6
26 +PYTHON_COMPAT=( python3_{4,5,6} )
27 +
28 +if [[ "${PV}" == "9999" ]]; then
29 + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
30 + EGIT_SUBMODULES=()
31 + inherit git-r3
32 +else
33 + EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
34 + KEYWORDS="~amd64"
35 + SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
36 + S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
37 +fi
38 +
39 +inherit python-any-r1 cmake-multilib
40 +
41 +DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
42 +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
43 +
44 +LICENSE="Apache-2.0"
45 +SLOT="0"
46 +IUSE="X wayland"
47 +
48 +# Old packaging will cause file collisions
49 +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
50 +DEPEND="${PYTHON_DEPS}
51 + dev-util/glslang:=[${MULTILIB_USEDEP}]
52 + dev-util/vulkan-headers
53 + media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
54 + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
55 + X? (
56 + x11-libs/libX11:=[${MULTILIB_USEDEP}]
57 + x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
58 + )"
59 +
60 +multilib_src_configure() {
61 + local mycmakeargs=(
62 + -DCMAKE_SKIP_RPATH=True
63 + -DBUILD_WSI_MIR_SUPPORT=False
64 + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
65 + -DBUILD_WSI_XCB_SUPPORT=$(usex X)
66 + -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
67 + -DGLSLANG_INSTALL_DIR="/usr"
68 + -DVULKAN_HEADERS_INSTALL_DIR="/usr"
69 + )
70 + cmake-utils_src_configure
71 +}
72 +
73 +multilib_src_install() {
74 + default
75 + mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
76 + mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
77 +}
78 +
79 +pkg_postinst() {
80 + einfo "The cube and cubepp demos have been renamed to"
81 + einfo "vulkancube and vulkancubecpp to prevent collisions"
82 +}