1 |
commit: 9d3dc8eb4e8aebb1ea8c898a55e881d725cc4f10 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 30 23:21:58 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 30 23:32:29 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3dc8eb |
7 |
|
8 |
media-libs/vulkan-layers: Update patch for 9999 |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
...an-layers-9999-Use-usr-for-vulkan-headers.patch | 97 ++++++++++++++++++++++ |
13 |
media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 +- |
14 |
2 files changed, 98 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..3ce12135039 |
19 |
--- /dev/null |
20 |
+++ b/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch |
21 |
@@ -0,0 +1,97 @@ |
22 |
+From 895c8a28b69be0ac436cd501e8d66f1b936393e3 Mon Sep 17 00:00:00 2001 |
23 |
+From: Nick Sarnie <sarnex@g.o> |
24 |
+Date: Wed, 30 May 2018 19:19:04 -0400 |
25 |
+Subject: [PATCH] Use usr for vulkan headers |
26 |
+ |
27 |
+Signed-off-by: Nick Sarnie <sarnex@g.o> |
28 |
+--- |
29 |
+ CMakeLists.txt | 2 +- |
30 |
+ layers/CMakeLists.txt | 5 +++-- |
31 |
+ scripts/lvl_genvk.py | 2 +- |
32 |
+ scripts/object_tracker_generator.py | 1 + |
33 |
+ scripts/parameter_validation_generator.py | 1 + |
34 |
+ scripts/spec.py | 2 +- |
35 |
+ 6 files changed, 8 insertions(+), 5 deletions(-) |
36 |
+ |
37 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
38 |
+index aa2e87ed..85c3cc21 100644 |
39 |
+--- a/CMakeLists.txt |
40 |
++++ b/CMakeLists.txt |
41 |
+@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") |
42 |
+ find_package(PythonInterp 3 REQUIRED) |
43 |
+ |
44 |
+ # TODO: Add option to override this with env var, or even to use SDK |
45 |
+-set(VULKAN_HEADERS_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") |
46 |
++set(VULKAN_HEADERS_LOCATION "/usr") |
47 |
+ |
48 |
+ # Output warning if vulkan headers submodule contents are not present |
49 |
+ if (NOT EXISTS "${VULKAN_HEADERS_LOCATION}/include/vulkan/vulkan_core.h") |
50 |
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt |
51 |
+index d67e8d79..2364f50e 100644 |
52 |
+--- a/layers/CMakeLists.txt |
53 |
++++ b/layers/CMakeLists.txt |
54 |
+@@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") |
55 |
+ # Define macro used for building vkxml generated files |
56 |
+ macro(run_vk_xml_generate dependency output) |
57 |
+ add_custom_command(OUTPUT ${output} |
58 |
+- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${output} |
59 |
+- DEPENDS ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${VULKAN_HEADERS_LOCATION}/registry/reg.py |
60 |
++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${output} |
61 |
++ DEPENDS ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py |
62 |
++${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/reg.py |
63 |
+ ) |
64 |
+ endmacro() |
65 |
+ |
66 |
+diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py |
67 |
+index 4dac9ca2..6ea83ddb 100644 |
68 |
+--- a/scripts/lvl_genvk.py |
69 |
++++ b/scripts/lvl_genvk.py |
70 |
+@@ -16,7 +16,7 @@ |
71 |
+ |
72 |
+ import argparse, cProfile, pdb, string, sys, time, os |
73 |
+ scripts_directory_path = os.path.dirname(os.path.abspath(__file__)) |
74 |
+-registry_headers_path = os.path.join(scripts_directory_path, '../Vulkan-Headers/registry') |
75 |
++registry_headers_path = os.path.join(scripts_directory_path, '/usr/include/vulkan/registry') |
76 |
+ sys.path.insert(0, registry_headers_path) |
77 |
+ |
78 |
+ from reg import * |
79 |
+diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py |
80 |
+index 8d4b68af..dd8a26fe 100644 |
81 |
+--- a/scripts/object_tracker_generator.py |
82 |
++++ b/scripts/object_tracker_generator.py |
83 |
+@@ -259,6 +259,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator): |
84 |
+ previous_dir = os.getcwd() |
85 |
+ os.chdir(os.path.dirname(sys.argv[0])) |
86 |
+ vuid_filename_locations = [ |
87 |
++ '/usr/include/vulkan/registry/validusage.json', |
88 |
+ './Vulkan-Headers/registry/validusage.json', |
89 |
+ '../Vulkan-Headers/registry/validusage.json', |
90 |
+ '../../Vulkan-Headers/registry/validusage.json', |
91 |
+diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py |
92 |
+index 66ede40d..29ef873a 100644 |
93 |
+--- a/scripts/parameter_validation_generator.py |
94 |
++++ b/scripts/parameter_validation_generator.py |
95 |
+@@ -189,6 +189,7 @@ class ParameterValidationOutputGenerator(OutputGenerator): |
96 |
+ previous_dir = os.getcwd() |
97 |
+ os.chdir(os.path.dirname(sys.argv[0])) |
98 |
+ vuid_filename_locations = [ |
99 |
++ '/usr/include/vulkan/registry/validusage.json', |
100 |
+ './Vulkan-Headers/registry/validusage.json', |
101 |
+ '../Vulkan-Headers/registry/validusage.json', |
102 |
+ '../../Vulkan-Headers/registry/validusage.json', |
103 |
+diff --git a/scripts/spec.py b/scripts/spec.py |
104 |
+index 4eeb46aa..0ea237b4 100644 |
105 |
+--- a/scripts/spec.py |
106 |
++++ b/scripts/spec.py |
107 |
+@@ -28,7 +28,7 @@ import re |
108 |
+ |
109 |
+ out_filename = "../layers/vk_validation_error_messages.h" # can override w/ '-out <filename>' option |
110 |
+ db_filename = "../layers/vk_validation_error_database.txt" # can override w/ '-gendb <filename>' option |
111 |
+-json_filename = "../Vulkan-Headers/registry/validusage.json" # can override w/ '-json-file <filename> option |
112 |
++json_filename = "/usr/include/vulkan/registry/validusage.json" # can override w/ '-json-file <filename> option |
113 |
+ gen_db = False # set to True when '-gendb <filename>' option provided |
114 |
+ json_compare = False # compare existing DB to json file input |
115 |
+ # This is the root spec link that is used in error messages to point users to spec sections |
116 |
+-- |
117 |
+2.17.1 |
118 |
+ |
119 |
|
120 |
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
121 |
index ca8180bed03..1c718ccc964 100644 |
122 |
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
123 |
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
124 |
@@ -37,7 +37,7 @@ DEPEND="${PYTHON_DEPS} |
125 |
)" |
126 |
|
127 |
PATCHES=( |
128 |
- "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" |
129 |
+ "${FILESDIR}/${PN}-9999-Use-usr-for-vulkan-headers.patch" |
130 |
"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" |
131 |
) |