From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:52:04 +0100 Subject: gentoo resync : 14.07.2018 --- media-libs/vulkan-layers/Manifest | 6 +- ...1.77.0-layers-Rework-include-dependencies.patch | 68 +++++++++++++++ .../vulkan-layers-Use-usr-for-vulkan-headers.patch | 97 ---------------------- .../vulkan-layers/vulkan-layers-1.1.77.0.ebuild | 3 +- media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 +- 5 files changed, 74 insertions(+), 102 deletions(-) create mode 100644 media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch delete mode 100644 media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch (limited to 'media-libs/vulkan-layers') diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 251c8374c7b5..806183ec0ffc 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,6 +1,6 @@ +AUX vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch 2441 BLAKE2B 445a3c6a453c9f08b8b58ac7ccb55fbbb61a942372dc2eebea7cb6552fe071334fd940ecf3e222a2319662b74c11e001ee0d1460720659cd2fdc00cfa9d269c5 SHA512 7582d2e7e3a65598f9a4b559d3c647f0824575c00f3415b1e54a8d3211cf6087f0cb7b95c2c4034888321ff12342817668c09eb0b5b91d2327c1f34cc37eccae 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 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2 DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411 -EBUILD vulkan-layers-1.1.77.0.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b -EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b +EBUILD vulkan-layers-1.1.77.0.ebuild 1660 BLAKE2B 866aab2a228bc43e226f1b48ce8ddb9e7149c334cd03ed124f8cabab619aec2b04771e07995855451b3d84cafed3175ae84dcc5aff59d75b3de992ea384ddc9b SHA512 ac65f13a924f4a75c4fa6730e59c9a35c2fb48eeb329cdbb109c973df4c4aa388ac5afb135bfaad9e095bac678780c5550ce46d645d88b1e81fdae44d5846b1f +EBUILD vulkan-layers-9999.ebuild 1589 BLAKE2B 18735830fd91904282c3e7f38d1dcd095f96541fb41b4f504dc4fdc9f6d4d5daf0ec1c7cd207c07d96421dcd9e4d51656c3d847ad1845c1d0b1976a1222edee3 SHA512 b461f270d7cb92a6c9da25e737388899b122fd7b7d603b2da3a44e3e0e609d0e955903b0f3c279b92c7d04a7479c846ed11c3946bbb637ec6dd5aa3f41085b65 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch new file mode 100644 index 000000000000..d0b48a749c26 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch @@ -0,0 +1,68 @@ +From 4c0da77c705464a259b38944fb53cf747e4c0554 Mon Sep 17 00:00:00 2001 +From: Lenny Komow +Date: Tue, 3 Jul 2018 10:17:21 -0600 +Subject: [PATCH] layers: Rework include dependencies + +This change removes the assumption that vk_layer.h will include +vk_layer_dispatch_table.h, since it will be removed from vk_layer.h +in the near future. + +Backported-by: Nick Sarnie + +Change-Id: I082ccc52c3cb8257bf57342404d52dd737009b4b +--- + layers/parameter_validation_utils.cpp | 1 + + layers/vk_layer_logging.h | 1 + + layers/vk_layer_table.h | 1 + + scripts/dispatch_table_helper_generator.py | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp +index 17f95bb8..c65a4970 100644 +--- a/layers/parameter_validation_utils.cpp ++++ b/layers/parameter_validation_utils.cpp +@@ -46,6 +46,7 @@ + #include "vk_layer_logging.h" + #include "vk_layer_extension_utils.h" + #include "vk_layer_utils.h" ++#include "vk_layer_dispatch_table.h" + + #include "parameter_name.h" + #include "parameter_validation.h" +diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h +index f111cc5d..f67a3f55 100644 +--- a/layers/vk_layer_logging.h ++++ b/layers/vk_layer_logging.h +@@ -31,6 +31,7 @@ + #include "vulkan/vk_layer.h" + #include "vk_object_types.h" + #include "vk_validation_error_messages.h" ++#include "vk_layer_dispatch_table.h" + #include + #include + #include +diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h +index 45b8f6e1..23990a12 100644 +--- a/layers/vk_layer_table.h ++++ b/layers/vk_layer_table.h +@@ -19,6 +19,7 @@ + + #pragma once + ++#include "vk_layer_dispatch_table.h" + #include "vulkan/vk_layer.h" + #include "vulkan/vulkan.h" + #include +diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py +index fba25e55..1e2412c0 100644 +--- a/scripts/dispatch_table_helper_generator.py ++++ b/scripts/dispatch_table_helper_generator.py +@@ -113,6 +113,7 @@ class DispatchTableHelperOutputGenerator(OutputGenerator): + preamble += '#include \n' + preamble += '#include \n' + preamble += '#include \n' ++ preamble += '#include "vk_layer_dispatch_table.h"\n' + + write(copyright, file=self.outFile) + write(preamble, file=self.outFile) +-- 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 deleted file mode 100644 index 0d5cb22f74d2..000000000000 --- a/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 157e9e714c64f3148f09053454d15a25af550a28 Mon Sep 17 00:00:00 2001 -From: Nick Sarnie -Date: Sat, 2 Jun 2018 07:01:28 -0400 -Subject: [PATCH] Use usr for vulkan headers - -Signed-off-by: Nick Sarnie ---- - 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..35485e35 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}/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..170bc0f5 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/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 ' option - db_filename = "../layers/vk_validation_error_database.txt" # can override w/ '-gendb ' option --json_filename = "../Vulkan-Headers/registry/validusage.json" # can override w/ '-json-file option -+json_filename = "/usr/share/vulkan/registry/validusage.json" # can override w/ '-json-file option - gen_db = False # set to True when '-gendb ' 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-1.1.77.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild index 436c46fc5259..cbe189ea63ce 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild @@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" DEPEND="${PYTHON_DEPS} dev-util/glslang:=[${MULTILIB_USEDEP}] >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] - dev-util/vulkan-headers + >=dev-util/vulkan-headers-1.1.77.0-r1 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] @@ -38,6 +38,7 @@ DEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + "${FILESDIR}/${PN}-1.1.77.0-layers-Rework-include-dependencies.patch" ) multilib_src_configure() { diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 436c46fc5259..b2e238baddb1 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" DEPEND="${PYTHON_DEPS} dev-util/glslang:=[${MULTILIB_USEDEP}] >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] - dev-util/vulkan-headers + >=dev-util/vulkan-headers-1.1.77.0-r1 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] -- cgit v1.2.3