diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:18:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:18:14 +0100 |
commit | 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (patch) | |
tree | 112eea4497761c0227537330b58f9c7e0af3f9d8 /media-libs/vulkan-loader/files | |
parent | 0bff53119f08d677db6c1a991bd30741682a8a08 (diff) |
gentoo resync : 02.06.2018
Diffstat (limited to 'media-libs/vulkan-loader/files')
-rw-r--r-- | media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch | 24 | ||||
-rw-r--r-- | media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch | 51 |
2 files changed, 0 insertions, 75 deletions
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch deleted file mode 100644 index b0cc73c44868..000000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-9999-Do-not-install-vulkan-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d3d9f1b73732d4f9d4d33bc7fa782cadbc10d80f Mon Sep 17 00:00:00 2001 -From: Nick Sarnie <sarnex@gentoo.org> -Date: Mon, 21 May 2018 22:34:25 -0400 -Subject: [PATCH] Do not install vulkan headers - -Signed-off-by: Nick Sarnie <sarnex@gentoo.org> ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 627de6f70..65f5ea0d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -170,7 +170,6 @@ if(NOT WIN32) - endif() - endif() - --install(DIRECTORY "${HEADERS_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan") - - # uninstall target --- -2.17.0 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch deleted file mode 100644 index 49dd54c83c8f..000000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d9b3835e1ad455853e3a58ec0d2a0653e5952a21 Mon Sep 17 00:00:00 2001 -From: Nick Sarnie <sarnex@gentoo.org> -Date: Mon, 26 May 2018 16:57:33 -0400 -Subject: [PATCH] Use /usr for vulkan-headers - -Signed-off-by: Nick Sarnie <sarnex@gentoo.org> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e0b744a87..14034d33c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,7 +68,7 @@ if(WIN32) - endif() - - set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts") --set(HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") -+set(HEADERS_DIR "/usr") - - # Output warning if vulkan headers submodule contents are not present - if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h") -@@ -131,8 +131,9 @@ set (PYTHON_CMD ${PYTHON_EXECUTABLE}) - # Define macro used for building vkxml generated files - macro(run_vk_xml_generate dependency output) - add_custom_command(OUTPUT ${output} -- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/registry/vk.xml ${output} -- DEPENDS ${HEADERS_DIR}/registry/vk.xml ${HEADERS_DIR}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/registry/reg.py -+ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${output} -+ DEPENDS ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${HEADERS_DIR}/include/vulkan/registry/generator.py -+ ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/include/vulkan/registry/reg.py - ) - endmacro() - -diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py -index 0de555fae..dab543ed3 100644 ---- a/scripts/lvl_genvk.py -+++ b/scripts/lvl_genvk.py -@@ -17,7 +17,7 @@ - import argparse, cProfile, pdb, string, sys, time, os - - scripts_dir = os.path.dirname(os.path.abspath(__file__)) --registry_dir = os.path.join(scripts_dir, '../Vulkan-Headers/registry') -+registry_dir = os.path.join(scripts_dir, '/usr/include/vulkan/registry') - sys.path.insert(0, registry_dir) - - from reg import * --- -2.17.0 - |