1 |
commit: 6d227501bb5dd45bad6d260b2dcc020474a48830 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 18 00:11:33 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 18 00:12:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d227501 |
7 |
|
8 |
media-libs/vulkan-loader: Drop old, update USE description |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
media-libs/vulkan-loader/Manifest | 1 - |
13 |
media-libs/vulkan-loader/metadata.xml | 3 +- |
14 |
.../vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild | 65 ---------------------- |
15 |
3 files changed, 1 insertion(+), 68 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest |
18 |
index 15b1d2558c0..b37d155550a 100644 |
19 |
--- a/media-libs/vulkan-loader/Manifest |
20 |
+++ b/media-libs/vulkan-loader/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26 |
23 |
DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48 |
24 |
DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e |
25 |
|
26 |
diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml |
27 |
index 5896567b6cb..6d56c31a9fe 100644 |
28 |
--- a/media-libs/vulkan-loader/metadata.xml |
29 |
+++ b/media-libs/vulkan-loader/metadata.xml |
30 |
@@ -9,7 +9,6 @@ |
31 |
<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id> |
32 |
</upstream> |
33 |
<use> |
34 |
- <flag name="demos">Build vulkan demos and vulkaninfo</flag> |
35 |
- <flag name="layers">Build the vulkan layers</flag> |
36 |
+ <flag name="layers">Include the vulkan layers</flag> |
37 |
</use> |
38 |
</pkgmetadata> |
39 |
|
40 |
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild |
41 |
deleted file mode 100644 |
42 |
index 3f8fd8e41b3..00000000000 |
43 |
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,65 +0,0 @@ |
46 |
-# Copyright 1999-2018 Gentoo Foundation |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=6 |
50 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
51 |
- |
52 |
-if [[ "${PV}" == "9999" ]]; then |
53 |
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" |
54 |
- inherit git-r3 |
55 |
-else |
56 |
- KEYWORDS="~amd64 ~x86" |
57 |
- SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" |
58 |
- S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" |
59 |
-fi |
60 |
- |
61 |
-inherit python-any-r1 cmake-multilib |
62 |
- |
63 |
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" |
64 |
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" |
65 |
- |
66 |
-LICENSE="Apache-2.0" |
67 |
-SLOT="0" |
68 |
-IUSE="demos layers wayland X" |
69 |
-REQUIRED_USE="demos? ( X )" |
70 |
- |
71 |
-RDEPEND="" |
72 |
-DEPEND="${PYTHON_DEPS} |
73 |
- demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) |
74 |
- layers? ( |
75 |
- dev-util/glslang:=[${MULTILIB_USEDEP}] |
76 |
- >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] |
77 |
- ) |
78 |
- wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) |
79 |
- X? ( |
80 |
- x11-libs/libX11:=[${MULTILIB_USEDEP}] |
81 |
- x11-libs/libXrandr:=[${MULTILIB_USEDEP}] |
82 |
- )" |
83 |
- |
84 |
-PATCHES=( |
85 |
- "${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch" |
86 |
- "${FILESDIR}/${PN}-Fix-layers-install-directory.patch" |
87 |
- "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" |
88 |
- ) |
89 |
- |
90 |
-multilib_src_configure() { |
91 |
- local mycmakeargs=( |
92 |
- -DCMAKE_SKIP_RPATH=True |
93 |
- -DBUILD_TESTS=False |
94 |
- -DBUILD_LAYERS=$(usex layers) |
95 |
- -DBUILD_DEMOS=$(usex demos) |
96 |
- -DBUILD_VKJSON=False |
97 |
- -DBUILD_LOADER=True |
98 |
- -DBUILD_WSI_MIR_SUPPORT=False |
99 |
- -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) |
100 |
- -DBUILD_WSI_XCB_SUPPORT=$(usex X) |
101 |
- -DBUILD_WSI_XLIB_SUPPORT=$(usex X) |
102 |
- ) |
103 |
- cmake-utils_src_configure |
104 |
-} |
105 |
- |
106 |
-multilib_src_install() { |
107 |
- keepdir /etc/vulkan/icd.d |
108 |
- |
109 |
- cmake-utils_src_install |
110 |
-} |