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-layers | |
parent | 0bff53119f08d677db6c1a991bd30741682a8a08 (diff) |
gentoo resync : 02.06.2018
Diffstat (limited to 'media-libs/vulkan-layers')
-rw-r--r-- | media-libs/vulkan-layers/Manifest | 8 | ||||
-rw-r--r-- | media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch | 70 | ||||
-rw-r--r-- | media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild (renamed from media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild) | 2 | ||||
-rw-r--r-- | media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 |
4 files changed, 61 insertions, 21 deletions
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 99175be6f267..1b7b852bbf93 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,6 +1,6 @@ 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 +AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2 +DIST vulkan-layers-0_pre20180601.tar.gz 1099188 BLAKE2B 74bc6aeb789485768639482bee5d4383db80344b3bd1f25c8767769d99199fb7db8c9bb6dfc597290aac1bec742851658300e52884fc734f5f6a1e4f8d3f8194 SHA512 7212a5359e56ef593d05c9aa61fd64f13737c55757a38d5d45d71f97f59a0719bf154dfc5a62a54905a944b3fcc24c08b56226c517fc79180a6f6584bf54850b +EBUILD vulkan-layers-0_pre20180601.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d +EBUILD vulkan-layers-9999.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch index a4829d9997a7..0d5cb22f74d2 100644 --- a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch +++ b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch @@ -1,20 +1,23 @@ -From 42fb7b4c73b0cae196a2eb6d97bfa6cc635f23fb Mon Sep 17 00:00:00 2001 +From 157e9e714c64f3148f09053454d15a25af550a28 Mon Sep 17 00:00:00 2001 From: Nick Sarnie <sarnex@gentoo.org> -Date: Sat, 26 May 2018 17:39:08 -0400 +Date: Sat, 2 Jun 2018 07:01:28 -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 +- - 3 files changed, 5 insertions(+), 4 deletions(-) + 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 178debdd..dc742304 100644 +index aa2e87ed..85c3cc21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -21,7 +21,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +@@ -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 @@ -24,7 +27,7 @@ index 178debdd..dc742304 100644 # 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 962c4be6..26e5abaf 100644 +index d67e8d79..35485e35 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -38,8 +38,9 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") @@ -33,14 +36,14 @@ index 962c4be6..26e5abaf 100644 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 ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${output} ++ DEPENDS ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/vk.xml ${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ++${VULKAN_HEADERS_LOCATION}/share/vulkan/registry/reg.py ) endmacro() diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py -index 4dac9ca2..6ea83ddb 100644 +index 4dac9ca2..170bc0f5 100644 --- a/scripts/lvl_genvk.py +++ b/scripts/lvl_genvk.py @@ -16,7 +16,7 @@ @@ -48,10 +51,47 @@ index 4dac9ca2..6ea83ddb 100644 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') ++registry_headers_path = os.path.join(scripts_directory_path, '/usr/share/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..ac3020c1 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/share/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..9eae6fed 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/share/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..212b0c57 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/share/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.0 +2.17.1 diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild b/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild index ca8180bed039..2187d9d65c0d 100644 --- a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b" + EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index ca8180bed039..2187d9d65c0d 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b" + EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" |