[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/files/, dev-util/vulkan-headers/
commit: dc860326a4daab6ad8789db89c34639fab35d899
Author: Nick Sarnie gentoo org>
AuthorDate: Mon Dec 5 17:33:33 2022 +
Commit: Nick Sarnie gentoo org>
CommitDate: Mon Dec 5 17:33:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc860326
dev-util/vulkan-headers: Drop patch
Fixed upstream
Signed-off-by: Nick Sarnie gentoo.org>
...tall-cmake-files-to-CMAKE_INSTALL_DATADIR.patch | 24 --
dev-util/vulkan-headers/vulkan-headers-.ebuild | 2 --
2 files changed, 26 deletions(-)
diff --git
a/dev-util/vulkan-headers/files/vulkan-headers--cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
b/dev-util/vulkan-headers/files/vulkan-headers--cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
deleted file mode 100644
index 98928683503d..
---
a/dev-util/vulkan-headers/files/vulkan-headers--cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 419626d4fc27c026c10cde6029a73d717843ac78 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie
-Date: Fri, 2 Dec 2022 23:32:11 -0500
-Subject: [PATCH] cmake: Install cmake files to CMAKE_INSTALL_DATADIR
-
-Signed-off-by: Nick Sarnie
- cmake/install.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/install.cmake b/cmake/install.cmake
-index c19b5e7..047df01 100644
a/cmake/install.cmake
-+++ b/cmake/install.cmake
-@@ -26,7 +26,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry"
DESTINATION ${VLK_REGIS
-
- set(export_name "VulkanHeadersConfig")
- set(namespace "Vulkan::")
--set(cmake_files_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/VulkanHeaders/)
-+set(cmake_files_install_dir ${CMAKE_INSTALL_DATADIR}/cmake/VulkanHeaders/)
-
- # Set EXPORT_NAME for consistency with established names. The CMake generated
ones won't work.
- set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers")
-
diff --git a/dev-util/vulkan-headers/vulkan-headers-.ebuild
b/dev-util/vulkan-headers/vulkan-headers-.ebuild
index d0f8e008ef76..591287d773f0 100644
--- a/dev-util/vulkan-headers/vulkan-headers-.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-.ebuild
@@ -22,5 +22,3 @@ LICENSE="Apache-2.0"
SLOT="0"
BDEPEND=">=dev-util/cmake-3.10.2"
-
-PATCHES="${FILESDIR}/${P}-cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch"
[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/files/, dev-util/vulkan-headers/
commit: 88b205d1087c7a1324cf2fbff8bb4256a79b45d9
Author: Nick Sarnie gentoo org>
AuthorDate: Sat Dec 3 04:41:38 2022 +
Commit: Nick Sarnie gentoo org>
CommitDate: Sat Dec 3 04:42:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b205d1
dev-util/vulkan-headers: Fix cmake file install dir
Closes: https://bugs.gentoo.org/883593
Signed-off-by: Nick Sarnie gentoo.org>
...tall-cmake-files-to-CMAKE_INSTALL_DATADIR.patch | 24 ++
dev-util/vulkan-headers/vulkan-headers-.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git
a/dev-util/vulkan-headers/files/vulkan-headers--cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
b/dev-util/vulkan-headers/files/vulkan-headers--cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
new file mode 100644
index ..98928683503d
--- /dev/null
+++
b/dev-util/vulkan-headers/files/vulkan-headers--cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch
@@ -0,0 +1,24 @@
+From 419626d4fc27c026c10cde6029a73d717843ac78 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie
+Date: Fri, 2 Dec 2022 23:32:11 -0500
+Subject: [PATCH] cmake: Install cmake files to CMAKE_INSTALL_DATADIR
+
+Signed-off-by: Nick Sarnie
+---
+ cmake/install.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/install.cmake b/cmake/install.cmake
+index c19b5e7..047df01 100644
+--- a/cmake/install.cmake
b/cmake/install.cmake
+@@ -26,7 +26,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/registry"
DESTINATION ${VLK_REGIS
+
+ set(export_name "VulkanHeadersConfig")
+ set(namespace "Vulkan::")
+-set(cmake_files_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/VulkanHeaders/)
++set(cmake_files_install_dir ${CMAKE_INSTALL_DATADIR}/cmake/VulkanHeaders/)
+
+ # Set EXPORT_NAME for consistency with established names. The CMake generated
ones won't work.
+ set_target_properties(Vulkan-Headers PROPERTIES EXPORT_NAME "Headers")
+
diff --git a/dev-util/vulkan-headers/vulkan-headers-.ebuild
b/dev-util/vulkan-headers/vulkan-headers-.ebuild
index 591287d773f0..d0f8e008ef76 100644
--- a/dev-util/vulkan-headers/vulkan-headers-.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-.ebuild
@@ -22,3 +22,5 @@ LICENSE="Apache-2.0"
SLOT="0"
BDEPEND=">=dev-util/cmake-3.10.2"
+
+PATCHES="${FILESDIR}/${P}-cmake-Install-cmake-files-to-CMAKE_INSTALL_DATADIR.patch"
[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/files/
commit: 63159d079a3c86bb5112a38d3adc114e0534fa0e
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Jan 6 10:39:47 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Jan 6 15:38:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63159d07
dev-util/vulkan-headers: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10752
Signed-off-by: Matt Turner gentoo.org>
...aders-1.1.77.0-r1-Remove-loader-layer-dep.patch | 38 --
1 file changed, 38 deletions(-)
diff --git
a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
b/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
deleted file mode 100644
index 9cf443a2244..000
---
a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 396f82798a4d19b57fc9933490dc1bd7624c9bbb Mon Sep 17 00:00:00 2001
-From: Lenny Komow
-Date: Mon, 25 Jun 2018 13:59:47 -0600
-Subject: [PATCH] headers: Remove loader/layer dependency
-
-The header vk_layer.h included vk_layer_dispatch_table.h, which is not
-present in this repo. Instead, it had to be generated from either the
-Vulkan-Loader or Vulkan-ValidationLayers repo. This change removes
-that dependency.
- include/vulkan/vk_layer.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
-index e8300c3..823c88a 100644
a/include/vulkan/vk_layer.h
-+++ b/include/vulkan/vk_layer.h
-@@ -35,9 +35,6 @@
- #define VK_LAYER_EXPORT
- #endif
-
--// Definition for VkLayerDispatchTable and VkLayerInstanceDispatchTable now
appear in externally generated header
--#include "vk_layer_dispatch_table.h"
--
- #define MAX_NUM_UNKNOWN_EXTS 250
-
- // Loader-Layer version negotiation API. Versions add the following
features:
-@@ -50,6 +47,9 @@
-
- #define VK_CURRENT_CHAIN_VERSION 1
-
-+// Typedef for use in the interfaces below
-+typedef PFN_vkVoidFunction (VKAPI_PTR
*PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
-+
- // Version negotiation values
- typedef enum VkNegotiateLayerStructType {
- LAYER_NEGOTIATE_UNINTIALIZED = 0,
-
