1 |
commit: a09c70e699b3a2abdf6b222d79f7db916690d96e |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 19 21:58:18 2022 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 20 02:09:04 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09c70e6 |
7 |
|
8 |
media-libs/vulkan-layers: Version bump |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
12 |
|
13 |
media-libs/vulkan-layers/Manifest | 1 + |
14 |
...ayers-1.3.204-Dont-use-static-spirv-tools.patch | 27 +++++++ |
15 |
...n-layers-1.3.204-Fix-dependency-detection.patch | 90 ++++++++++++++++++++++ |
16 |
...rs-9999.ebuild => vulkan-layers-1.3.204.ebuild} | 12 ++- |
17 |
media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 4 +- |
18 |
5 files changed, 128 insertions(+), 6 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest |
21 |
index 53a0a76e7a55..246391f920ad 100644 |
22 |
--- a/media-libs/vulkan-layers/Manifest |
23 |
+++ b/media-libs/vulkan-layers/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0 |
26 |
+DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f |
27 |
|
28 |
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch |
29 |
new file mode 100644 |
30 |
index 000000000000..791ac6764bce |
31 |
--- /dev/null |
32 |
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch |
33 |
@@ -0,0 +1,27 @@ |
34 |
+From 68f030f9e776d1f2549e471f40c9794f6056bb05 Mon Sep 17 00:00:00 2001 |
35 |
+From: Nick Sarnie <sarnex@g.o> |
36 |
+Date: Sat, 19 Feb 2022 20:41:44 -0500 |
37 |
+Subject: [PATCH] Dont use static spirv-tools |
38 |
+ |
39 |
+Signed-off-by: Nick Sarnie <sarnex@g.o> |
40 |
+--- |
41 |
+ layers/CMakeLists.txt | 2 +- |
42 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
43 |
+ |
44 |
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt |
45 |
+index 59e294a07..5d30a9834 100644 |
46 |
+--- a/layers/CMakeLists.txt |
47 |
++++ b/layers/CMakeLists.txt |
48 |
+@@ -310,7 +310,7 @@ if(BUILD_LAYERS) |
49 |
+ target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR}) |
50 |
+ endif() |
51 |
+ target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) |
52 |
+- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) |
53 |
++ target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt) |
54 |
+ |
55 |
+ |
56 |
+ # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled |
57 |
+ |
58 |
+-- |
59 |
+2.35.1 |
60 |
+ |
61 |
|
62 |
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch |
63 |
new file mode 100644 |
64 |
index 000000000000..25f3b4bafd27 |
65 |
--- /dev/null |
66 |
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch |
67 |
@@ -0,0 +1,90 @@ |
68 |
+From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001 |
69 |
+From: Jeremy Gebben <jeremyg@××××××.com> |
70 |
+Date: Thu, 17 Feb 2022 15:26:25 -0700 |
71 |
+Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations |
72 |
+ |
73 |
+If the SPIRV-Headers package is not found, fall back to looking for |
74 |
+headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR. |
75 |
+ |
76 |
+Fixes #3765 |
77 |
+--- |
78 |
+ CMakeLists.txt | 19 ++++++++++++++++--- |
79 |
+ layers/CMakeLists.txt | 7 +------ |
80 |
+ tests/CMakeLists.txt | 6 +++--- |
81 |
+ 3 files changed, 20 insertions(+), 12 deletions(-) |
82 |
+ |
83 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
84 |
+index d4ca786ca07..58a966f03d6 100644 |
85 |
+--- a/CMakeLists.txt |
86 |
++++ b/CMakeLists.txt |
87 |
+@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING) |
88 |
+ endif() |
89 |
+ endif() |
90 |
+ |
91 |
+-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "") |
92 |
+ if(BUILD_LAYERS OR BUILD_TESTS) |
93 |
+- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") |
94 |
+- find_package(SPIRV-Headers REQUIRED CONFIG) |
95 |
++ find_package(SPIRV-Headers CONFIG QUIET) |
96 |
++ if(SPIRV-Headers_FOUND) |
97 |
++ # pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed' |
98 |
++ # version of SPIRV-Headers, the package will be found. |
99 |
++ get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES) |
100 |
++ elseif(SPIRV_HEADERS_INCLUDE_DIR) |
101 |
++ # This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory |
102 |
++ if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h") |
103 |
++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}") |
104 |
++ endif() |
105 |
++ elseif(SPIRV_HEADERS_INSTALL_DIR) |
106 |
++ # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers |
107 |
++ if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h") |
108 |
++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}") |
109 |
++ endif() |
110 |
++ set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include") |
111 |
+ endif() |
112 |
+ endif() |
113 |
+ |
114 |
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt |
115 |
+index 6edcf6eb5ab..59e294a0793 100644 |
116 |
+--- a/layers/CMakeLists.txt |
117 |
++++ b/layers/CMakeLists.txt |
118 |
+@@ -309,12 +309,7 @@ if(BUILD_LAYERS) |
119 |
+ if (USE_ROBIN_HOOD_HASHING) |
120 |
+ target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR}) |
121 |
+ endif() |
122 |
+- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") |
123 |
+- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers) |
124 |
+- else() |
125 |
+- target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) |
126 |
+- endif() |
127 |
+- |
128 |
++ target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) |
129 |
+ target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) |
130 |
+ |
131 |
+ |
132 |
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
133 |
+index 2b98d109b7f..780c0538486 100644 |
134 |
+--- a/tests/CMakeLists.txt |
135 |
++++ b/tests/CMakeLists.txt |
136 |
+@@ -1,6 +1,6 @@ |
137 |
+ # ~~~ |
138 |
+-# Copyright (c) 2014-2021 Valve Corporation |
139 |
+-# Copyright (c) 2014-2021 LunarG, Inc. |
140 |
++# Copyright (c) 2014-2022 Valve Corporation |
141 |
++# Copyright (c) 2014-2022 LunarG, Inc. |
142 |
+ # |
143 |
+ # Licensed under the Apache License, Version 2.0 (the "License"); |
144 |
+ # you may not use this file except in compliance with the License. |
145 |
+@@ -149,11 +149,11 @@ if (NOT MSVC) |
146 |
+ target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare") |
147 |
+ endif() |
148 |
+ |
149 |
++target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) |
150 |
+ # Specify target_link_libraries |
151 |
+ target_link_libraries(vk_layer_validation_tests |
152 |
+ PRIVATE VkLayer_utils |
153 |
+ ${GLSLANG_LIBRARIES} |
154 |
+- SPIRV-Headers::SPIRV-Headers |
155 |
+ SPIRV-Tools-static SPIRV-Tools-opt |
156 |
+ GTest::gtest GTest::gtest_main) |
157 |
+ |
158 |
|
159 |
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild |
160 |
similarity index 84% |
161 |
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
162 |
copy to media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild |
163 |
index 5beaf4f6dc7a..2288a824c1fd 100644 |
164 |
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
165 |
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild |
166 |
@@ -1,4 +1,4 @@ |
167 |
-# Copyright 1999-2021 Gentoo Authors |
168 |
+# Copyright 1999-2022 Gentoo Authors |
169 |
# Distributed under the terms of the GNU General Public License v2 |
170 |
|
171 |
EAPI=7 |
172 |
@@ -21,15 +21,20 @@ fi |
173 |
DESCRIPTION="Vulkan Validation Layers" |
174 |
HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" |
175 |
|
176 |
+PATCHES=( |
177 |
+ "${FILESDIR}"/${P}-Fix-dependency-detection.patch |
178 |
+ "${FILESDIR}"/${P}-Dont-use-static-spirv-tools.patch |
179 |
+) |
180 |
+ |
181 |
LICENSE="Apache-2.0" |
182 |
SLOT="0" |
183 |
IUSE="wayland X" |
184 |
|
185 |
BDEPEND=">=dev-util/cmake-3.10.2" |
186 |
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]" |
187 |
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]" |
188 |
DEPEND="${RDEPEND} |
189 |
${PYTHON_DEPS} |
190 |
- dev-cpp/robin-hood-hashing |
191 |
+ >=dev-cpp/robin-hood-hashing-3.11.5 |
192 |
~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] |
193 |
~dev-util/vulkan-headers-${PV} |
194 |
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) |
195 |
@@ -51,7 +56,6 @@ multilib_src_configure() { |
196 |
-DBUILD_TESTS=OFF |
197 |
-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr" |
198 |
-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/" |
199 |
- -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" |
200 |
) |
201 |
cmake_src_configure |
202 |
} |
203 |
|
204 |
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
205 |
index 5beaf4f6dc7a..b4edb5a84d37 100644 |
206 |
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
207 |
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
208 |
@@ -1,4 +1,4 @@ |
209 |
-# Copyright 1999-2021 Gentoo Authors |
210 |
+# Copyright 1999-2022 Gentoo Authors |
211 |
# Distributed under the terms of the GNU General Public License v2 |
212 |
|
213 |
EAPI=7 |
214 |
@@ -29,7 +29,7 @@ BDEPEND=">=dev-util/cmake-3.10.2" |
215 |
RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]" |
216 |
DEPEND="${RDEPEND} |
217 |
${PYTHON_DEPS} |
218 |
- dev-cpp/robin-hood-hashing |
219 |
+ >=dev-cpp/robin-hood-hashing-3.11.5 |
220 |
~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] |
221 |
~dev-util/vulkan-headers-${PV} |
222 |
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) |