diff options
Diffstat (limited to 'media-libs/vulkan-layers')
3 files changed, 100 insertions, 2 deletions
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 99175be6f267..7dad3c7060a2 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,6 +1,7 @@ +AUX vulkan-layers-9999-Use-usr-for-vulkan-headers.patch 4931 BLAKE2B ae95e01ba7f0e62145db587feebb2c65545f597a0bb2a467e8287d639ad4bd3c52a3d896c9f13f193ad10a1eef864f201f465dff6687f153949cb436a17762d4 SHA512 cdc3496b3673bea3ffad267aee4143df98a1b31b11848901b0a97d043478043f982da1362437f378e0e6b838a9d8c0363db0e1dc3da4a077047b8cdaeb59428c AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 2610 BLAKE2B a7ae2f31d1eed1bf0120d09e91b67a45a3ef3dae62e19221185eab7edbf7a23bcd6397cea2153ef893e3e958c70a165fbaecb9192c69e81f586c06cb04e124dd SHA512 f55ab09cdaa10562a472001be4613ab2eaf3fed97bd77618d13047d5040d2181236dd8d0366ea13494dcd37abc535448493a9521006bcfd95e89b0bdc57ad51c DIST vulkan-layers-0_pre20180526.tar.gz 1138198 BLAKE2B 33788256d82c1bc3dd071d15ecd0e3bb024fc35693b6b988e12990d0af7a6d209b02a01893b288e3ae3b1a499803e23118429de1efe3189c9a8369c0ec9ab02f SHA512 412c9cf95415d93191529fd4c9712e93e1939d74dece028d42f7f9199f0b686a7aa15554249590a0777cb9c6fd4cbb85cfd87b9eea11bc02400976cbd81a52f1 EBUILD vulkan-layers-0_pre20180526.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8 -EBUILD vulkan-layers-9999.ebuild 1591 BLAKE2B f1a8ed816e0094c81b0ee222529b85390b145b8ca4ce95bb7b6b8e0ed3bb9eff300a29dbe7e03320541f57846edffebeb940729e915fb25595c094055552be7c SHA512 2d3062f930bd070c312d360fee4506c616db0a22607e51d6ae7521f7f80d5dbcbc35887a20597a7c55af57e90a2e38c7cc28ae06c050c24951582f5ae4d931f8 +EBUILD vulkan-layers-9999.ebuild 1596 BLAKE2B 26d624c532063c005851983cdfad52c55d491a001a5b8fab0eabf2bc24f4f783572acda7b19a0a39551b45489c0a4279313297fa887a40c4ef1d2a935b4b35aa SHA512 e536ca47643193aa15a96a348db1c431e9895ca79a267d20fb9f9e22f622b17a74a32d69acbeafa0a595fd48b59cab3179dc51502a24bbc758277ed5b574f6ed MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 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 new file mode 100644 index 000000000000..3ce121350395 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch @@ -0,0 +1,97 @@ +From 895c8a28b69be0ac436cd501e8d66f1b936393e3 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie <sarnex@gentoo.org> +Date: Wed, 30 May 2018 19:19:04 -0400 +Subject: [PATCH] Use usr for vulkan headers + +Signed-off-by: Nick Sarnie <sarnex@gentoo.org> +--- + CMakeLists.txt | 2 +- + layers/CMakeLists.txt | 5 +++-- + scripts/lvl_genvk.py | 2 +- + scripts/object_tracker_generator.py | 1 + + scripts/parameter_validation_generator.py | 1 + + scripts/spec.py | 2 +- + 6 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa2e87ed..85c3cc21 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + find_package(PythonInterp 3 REQUIRED) + + # TODO: Add option to override this with env var, or even to use SDK +-set(VULKAN_HEADERS_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers") ++set(VULKAN_HEADERS_LOCATION "/usr") + + # Output warning if vulkan headers submodule contents are not present + if (NOT EXISTS "${VULKAN_HEADERS_LOCATION}/include/vulkan/vulkan_core.h") +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index d67e8d79..2364f50e 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") + # 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 ${VULKAN_HEADERS_LOCATION}/registry/vk.xml ${output} +- 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 ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/vk.xml ${output} ++ 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 ++${VULKAN_HEADERS_LOCATION}/include/vulkan/registry/reg.py + ) + endmacro() + +diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py +index 4dac9ca2..6ea83ddb 100644 +--- a/scripts/lvl_genvk.py ++++ b/scripts/lvl_genvk.py +@@ -16,7 +16,7 @@ + + import argparse, cProfile, pdb, string, sys, time, os + scripts_directory_path = os.path.dirname(os.path.abspath(__file__)) +-registry_headers_path = os.path.join(scripts_directory_path, '../Vulkan-Headers/registry') ++registry_headers_path = os.path.join(scripts_directory_path, '/usr/include/vulkan/registry') + sys.path.insert(0, registry_headers_path) + + from reg import * +diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py +index 8d4b68af..dd8a26fe 100644 +--- a/scripts/object_tracker_generator.py ++++ b/scripts/object_tracker_generator.py +@@ -259,6 +259,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator): + previous_dir = os.getcwd() + os.chdir(os.path.dirname(sys.argv[0])) + vuid_filename_locations = [ ++ '/usr/include/vulkan/registry/validusage.json', + './Vulkan-Headers/registry/validusage.json', + '../Vulkan-Headers/registry/validusage.json', + '../../Vulkan-Headers/registry/validusage.json', +diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py +index 66ede40d..29ef873a 100644 +--- a/scripts/parameter_validation_generator.py ++++ b/scripts/parameter_validation_generator.py +@@ -189,6 +189,7 @@ class ParameterValidationOutputGenerator(OutputGenerator): + previous_dir = os.getcwd() + os.chdir(os.path.dirname(sys.argv[0])) + vuid_filename_locations = [ ++ '/usr/include/vulkan/registry/validusage.json', + './Vulkan-Headers/registry/validusage.json', + '../Vulkan-Headers/registry/validusage.json', + '../../Vulkan-Headers/registry/validusage.json', +diff --git a/scripts/spec.py b/scripts/spec.py +index 4eeb46aa..0ea237b4 100644 +--- a/scripts/spec.py ++++ b/scripts/spec.py +@@ -28,7 +28,7 @@ import re + + out_filename = "../layers/vk_validation_error_messages.h" # can override w/ '-out <filename>' option + db_filename = "../layers/vk_validation_error_database.txt" # can override w/ '-gendb <filename>' option +-json_filename = "../Vulkan-Headers/registry/validusage.json" # can override w/ '-json-file <filename> option ++json_filename = "/usr/include/vulkan/registry/validusage.json" # can override w/ '-json-file <filename> option + gen_db = False # set to True when '-gendb <filename>' option provided + json_compare = False # compare existing DB to json file input + # This is the root spec link that is used in error messages to point users to spec sections +-- +2.17.1 + diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index ca8180bed039..1c718ccc9648 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -37,7 +37,7 @@ DEPEND="${PYTHON_DEPS} )" PATCHES=( - "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" + "${FILESDIR}/${PN}-9999-Use-usr-for-vulkan-headers.patch" "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" ) |