Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/files/
Date: Sun, 06 Jan 2019 15:39:33
Message-Id: 1546789128.b71237afece6ba5bc119198e0636378dbdaa454e.mattst88@gentoo
1 commit: b71237afece6ba5bc119198e0636378dbdaa454e
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 6 10:40:24 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 6 15:38:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71237af
7
8 media-libs/vulkan-loader: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 ...1.77.0-loader-Rework-include-dependencies.patch | 54 ----------------------
14 1 file changed, 54 deletions(-)
15
16 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
17 deleted file mode 100644
18 index 21fe853ce4e..00000000000
19 --- a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
20 +++ /dev/null
21 @@ -1,54 +0,0 @@
22 -From 700483f5d92de01c1c8f413f8a4172d96684e93e Mon Sep 17 00:00:00 2001
23 -From: Lenny Komow <lenny@××××××.com>
24 -Date: Mon, 25 Jun 2018 14:09:51 -0600
25 -Subject: [PATCH] loader: Rework include dependencies
26 -
27 -This change removes the assumption that vk_layer.h will include
28 -vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
29 -in the near future.
30 -
31 -Change-Id: I3fed5efbc35781c96aa9d0977d046c8555e04a7c
32 ----
33 - CMakeLists.txt | 2 --
34 - loader/loader.h | 1 +
35 - scripts/dispatch_table_helper_generator.py | 1 +
36 - 3 files changed, 2 insertions(+), 2 deletions(-)
37 -
38 -diff --git a/CMakeLists.txt b/CMakeLists.txt
39 -index b942bd47c..64f498945 100644
40 ---- a/CMakeLists.txt
41 -+++ b/CMakeLists.txt
42 -@@ -201,8 +201,6 @@ if(NOT WIN32)
43 - endif()
44 - endif()
45 -
46 --install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
47 --
48 - # uninstall target
49 - if(NOT TARGET uninstall)
50 - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
51 -diff --git a/loader/loader.h b/loader/loader.h
52 -index 0af2abf27..c39c5385e 100644
53 ---- a/loader/loader.h
54 -+++ b/loader/loader.h
55 -@@ -34,6 +34,7 @@
56 - #include <vulkan/vk_layer.h>
57 - #include <vulkan/vk_icd.h>
58 - #include <assert.h>
59 -+#include "vk_layer_dispatch_table.h"
60 - #include "vk_loader_extensions.h"
61 -
62 - #if defined(__GNUC__) && __GNUC__ >= 4
63 -diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
64 -index fba25e55e..1e2412c0c 100644
65 ---- a/scripts/dispatch_table_helper_generator.py
66 -+++ b/scripts/dispatch_table_helper_generator.py
67 -@@ -113,6 +113,7 @@ def beginFile(self, genOpts):
68 - preamble += '#include <vulkan/vulkan.h>\n'
69 - preamble += '#include <vulkan/vk_layer.h>\n'
70 - preamble += '#include <string.h>\n'
71 -+ preamble += '#include "vk_layer_dispatch_table.h"\n'
72 -
73 - write(copyright, file=self.outFile)
74 - write(preamble, file=self.outFile)
75 -