Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/
Date: Thu, 05 Mar 2020 07:22:06
Message-Id: 1583392798.a8f1b7561646b10a08d5cc14e32c1150c90add76.amadio@gentoo
1 commit: a8f1b7561646b10a08d5cc14e32c1150c90add76
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 11 21:03:35 2020 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 07:19:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f1b756
7
8 dev-util/vulkan-tools: version bump to 1.2.133
9
10 Closes: https://github.com/gentoo/gentoo/pull/14835
11
12 Package-Manager: Portage-2.3.89, Repoman-2.3.20
13 Acked-by: Nick Sarnie <sarnex <AT> gentoo.org>
14 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
15
16 dev-util/vulkan-tools/Manifest | 1 +
17 dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild | 94 +++++++++++++++++++++++
18 2 files changed, 95 insertions(+)
19
20 diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
21 index ebaf3ed5372..44a327d2acf 100644
22 --- a/dev-util/vulkan-tools/Manifest
23 +++ b/dev-util/vulkan-tools/Manifest
24 @@ -1 +1,2 @@
25 DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
26 +DIST vulkan-tools-1.2.133.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
27
28 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild
29 new file mode 100644
30 index 00000000000..8a03a60cf6d
31 --- /dev/null
32 +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild
33 @@ -0,0 +1,94 @@
34 +# Copyright 1999-2020 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +PYTHON_COMPAT=( python3_{6,7} )
39 +
40 +if [[ "${PV}" == "9999" ]]; then
41 + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
42 + EGIT_SUBMODULES=()
43 + inherit git-r3
44 +else
45 + EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
46 + KEYWORDS="~amd64 ~ppc64"
47 + SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
48 + S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
49 +fi
50 +
51 +inherit python-any-r1 cmake-multilib
52 +
53 +DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
54 +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
55 +
56 +LICENSE="Apache-2.0"
57 +SLOT="0"
58 +IUSE="+cube +vulkaninfo +X wayland"
59 +COMMON_DEPEND=">=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
60 + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
61 + X? (
62 + x11-libs/libX11:=[${MULTILIB_USEDEP}]
63 + x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
64 + )"
65 +
66 +BDEPEND="${PYTHON_DEPS}
67 + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
68 +DEPEND=">=dev-util/vulkan-headers-${PV}
69 + ${COMMON_DEPEND}"
70 +RDEPEND="${COMMON_DEPEND}"
71 +
72 +# Vulkaninfo does not support wayland
73 +REQUIRED_USE="|| ( X wayland )
74 + vulkaninfo? ( X )"
75 +
76 +pkg_setup() {
77 + MULTILIB_CHOST_TOOLS=()
78 +
79 + if use vulkaninfo; then
80 + MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
81 + fi
82 +
83 + if use cube; then
84 + MULTILIB_CHOST_TOOLS+=(
85 + /usr/bin/vkcube
86 + /usr/bin/vkcubepp
87 + )
88 + fi
89 +
90 + python-any-r1_pkg_setup
91 +}
92 +
93 +multilib_src_configure() {
94 + local mycmakeargs=(
95 + -DCMAKE_SKIP_RPATH=True
96 + -DBUILD_CUBE=$(usex cube)
97 + -DBUILD_VULKANINFO=$(usex vulkaninfo)
98 + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
99 + -DBUILD_WSI_XCB_SUPPORT=$(usex X)
100 + -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
101 + -DGLSLANG_INSTALL_DIR="/usr"
102 + -DVULKAN_HEADERS_INSTALL_DIR="/usr"
103 + )
104 +
105 + # Upstream only supports one window system at a time
106 + # If X is set at all, even if wayland is set, use X
107 + #
108 + # If -cube and/or -vulkaninfo is set, the flags we set
109 + # are ignored, so we don't need to consider that
110 + if use X; then
111 + mycmakeargs+=(
112 + -DCUBE_WSI_SELECTION="XCB"
113 + )
114 + fi
115 +
116 + if ! use X && use wayland; then
117 + mycmakeargs+=(
118 + -DCUBE_WSI_SELECTION="WAYLAND"
119 + )
120 + fi
121 +
122 + cmake-utils_src_configure
123 +}
124 +
125 +multilib_src_install() {
126 + cmake-utils_src_install
127 +}