Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan /
vulkan-loader
Commits:
da68b49c by Timo Aaltonen at 2018-08-24T08:07:58Z
install-vulkan-intel-header.diff: Dropped
- - - - -
4 changed files:
- debian/copyright
- debian/libvulkan-dev.install
- − debian/patches/install-vulkan-intel-header.diff
- debian/patches/series
Changes:
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,10 +35,6 @@ Files: debian/*
Copyright: 2016 Timo Aaltonen <tjaal...@debian.org>
License: MIT or Apache-2.0
-Files: debian/patches/install-vulkan-intel-header.diff
-Copyright: 2015 Intel Corporation
-License: MIT
-
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
=====================================
debian/libvulkan-dev.install
=====================================
--- a/debian/libvulkan-dev.install
+++ b/debian/libvulkan-dev.install
@@ -1,3 +1,2 @@
-usr/include/vulkan
usr/lib/*/libvulkan.so
usr/lib/*/pkgconfig/vulkan.pc
=====================================
debian/patches/install-vulkan-intel-header.diff deleted
=====================================
--- a/debian/patches/install-vulkan-intel-header.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/include/vulkan/vulkan_intel.h b/include/vulkan/vulkan_intel.h
-new file mode 100644
-index 0000000..8ede61b
---- /dev/null
-+++ b/include/vulkan/vulkan_intel.h
-@@ -0,0 +1,62 @@
-+/*
-+ * Copyright © 2015 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS
-+ * IN THE SOFTWARE.
-+ */
-+
-+#ifndef __VULKAN_INTEL_H__
-+#define __VULKAN_INTEL_H__
-+
-+#include "vulkan.h"
-+
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif // __cplusplus
-+
-+#define VK_STRUCTURE_TYPE_DMA_BUF_IMAGE_CREATE_INFO_INTEL 1024
-+typedef struct VkDmaBufImageCreateInfo_
-+{
-+ VkStructureType sType;
// Must be VK_STRUCTURE_TYPE_DMA_BUF_IMAGE_CREATE_INFO_INTEL
-+ const void* pNext;
// Pointer to next structure.
-+ int fd;
-+ VkFormat format;
-+ VkExtent3D extent; // Depth must
be 1
-+ uint32_t strideInBytes;
-+} VkDmaBufImageCreateInfo;
-+
-+typedef VkResult (VKAPI_PTR *PFN_vkCreateDmaBufImageINTEL)(VkDevice device,
const VkDmaBufImageCreateInfo* pCreateInfo, const VkAllocationCallbacks*
pAllocator, VkDeviceMemory* pMem, VkImage* pImage);
-+
-+#ifndef VK_NO_PROTOTYPES
-+
-+VKAPI_ATTR VkResult VKAPI_CALL vkCreateDmaBufImageINTEL(
-+ VkDevice _device,
-+ const VkDmaBufImageCreateInfo* pCreateInfo,
-+ const VkAllocationCallbacks* pAllocator,
-+ VkDeviceMemory* pMem,
-+ VkImage* pImage);
-+
-+#endif
-+
-+#ifdef __cplusplus
-+} // extern "C"
-+#endif // __cplusplus
-+
-+#endif // __VULKAN_INTEL_H__
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-install-vulkan-intel-header.diff
fix-pkgconfig.diff
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/commit/da68b49ced4731a8b9dfc6a5c96d02cdd1ee774d
--
View it on GitLab:
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/commit/da68b49ced4731a8b9dfc6a5c96d02cdd1ee774d
You're receiving this email because of your account on salsa.debian.org.
