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: Tue, 18 Sep 2018 00:13:18
Message-Id: 1537229575.c250141e5e93aaaf16a12e7779476624b8231410.sarnex@gentoo
1 commit: c250141e5e93aaaf16a12e7779476624b8231410
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 17 23:30:01 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 18 00:12:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c250141e
7
8 dev-util/vulkan-tools: Drop old
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 .../vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild | 89 ----------------------
13 1 file changed, 89 deletions(-)
14
15 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
16 deleted file mode 100644
17 index 6fa37cabccc..00000000000
18 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
19 +++ /dev/null
20 @@ -1,89 +0,0 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 -# Distributed under the terms of the GNU General Public License v2
23 -
24 -EAPI=6
25 -PYTHON_COMPAT=( python3_{4,5,6} )
26 -
27 -if [[ "${PV}" == "9999" ]]; then
28 - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
29 - EGIT_SUBMODULES=()
30 - inherit git-r3
31 -else
32 - EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
33 - KEYWORDS="~amd64"
34 - SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
35 - S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
36 -fi
37 -
38 -inherit python-any-r1 cmake-multilib
39 -
40 -DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
41 -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
42 -
43 -LICENSE="Apache-2.0"
44 -SLOT="0"
45 -IUSE="+cube +vulkaninfo X wayland"
46 -
47 -# Old packaging will cause file collisions
48 -RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
49 -DEPEND="${PYTHON_DEPS}
50 - cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
51 - dev-util/vulkan-headers
52 - media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
53 - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
54 - X? (
55 - x11-libs/libX11:=[${MULTILIB_USEDEP}]
56 - x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
57 - )"
58 -
59 -# Vulkaninfo does not support wayland
60 -REQUIRED_USE="|| ( X wayland )
61 - vulkaninfo? ( X )"
62 -
63 -multilib_src_configure() {
64 - local mycmakeargs=(
65 - -DCMAKE_SKIP_RPATH=True
66 - -DBUILD_CUBE=$(usex cube)
67 - -DBUILD_VULKANINFO=$(usex vulkaninfo)
68 - -DBUILD_WSI_MIR_SUPPORT=False
69 - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
70 - -DBUILD_WSI_XCB_SUPPORT=$(usex X)
71 - -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
72 - -DGLSLANG_INSTALL_DIR="/usr"
73 - -DVULKAN_HEADERS_INSTALL_DIR="/usr"
74 - )
75 -
76 - # Upstream only supports one window system at a time
77 - # If X is set at all, even if wayland is set, use X
78 - #
79 - # If -cube and/or -vulkaninfo is set, the flags we set
80 - # are ignored, so we don't need to consider that
81 - if use X; then
82 - mycmakeargs+=(
83 - -DCUBE_WSI_SELECTION="XCB"
84 - -DVULKANINFO_WSI_SELECTION="XCB"
85 - )
86 - fi
87 -
88 - if ! use X && use wayland; then
89 - mycmakeargs+=(
90 - -DCUBE_WSI_SELECTION="WAYLAND"
91 - )
92 - fi
93 -
94 - cmake-utils_src_configure
95 -}
96 -
97 -multilib_src_install() {
98 - cmake-utils_src_install
99 -
100 - if use cube; then
101 - mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
102 - mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
103 - fi
104 -}
105 -
106 -pkg_postinst() {
107 - einfo "The cube and cubepp demos have been renamed to"
108 - einfo "vulkancube and vulkancubecpp to prevent collisions"
109 -}