[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/, media-libs/vulkan-layers/files/

[Nick Sarnie]

commit:     a686a553ac413418deb87a6ff711b8bacaa60b15
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 11:16:17 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 11:34:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a686a553

media-libs/vulkan-layers: Support dev-util/vulkan-headers install target

Update the patch to support the new install location
Resnapshot
Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-layers/Manifest                  |  2 +-
 ...an-layers-9999-Use-usr-for-vulkan-headers.patch | 97 ----------------------
 .../vulkan-layers-Use-usr-for-vulkan-headers.patch | 70 ++++++++++++----
 ...6.ebuild => vulkan-layers-0_pre20180601.ebuild} |  2 +-
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  4 +-
 5 files changed, 59 insertions(+), 116 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index a3c8264d50b..a339d757479 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1 @@
-DIST vulkan-layers-0_pre20180526.tar.gz 1138198 BLAKE2B 33788256d82c1bc3dd071d15ecd0e3bb024fc35693b6b988e12990d0af7a6d209b02a01893b288e3ae3b1a499803e23118429de1efe3189c9a8369c0ec9ab02f SHA512 412c9cf95415d93191529fd4c9712e93e1939d74dece028d42f7f9199f0b686a7aa15554249590a0777cb9c6fd4cbb85cfd87b9eea11bc02400976cbd81a52f1
+DIST vulkan-layers-0_pre20180601.tar.gz 1099188 BLAKE2B 74bc6aeb789485768639482bee5d4383db80344b3bd1f25c8767769d99199fb7db8c9bb6dfc597290aac1bec742851658300e52884fc734f5f6a1e4f8d3f8194 SHA512 7212a5359e56ef593d05c9aa61fd64f13737c55757a38d5d45d71f97f59a0719bf154dfc5a62a54905a944b3fcc24c08b56226c517fc79180a6f6584bf54850b

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
deleted file mode 100644
index 3ce12135039..00000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-9999-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 895c8a28b69be0ac436cd501e8d66f1b936393e3 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@g.o>
-Date: Wed, 30 May 2018 19:19:04 -0400
-Subject: [PATCH] Use usr for vulkan headers
-
-Signed-off-by: Nick Sarnie <sarnex@g.o>
----
- 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/files/vulkan-layers-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-usr-for-vulkan-headers.patch
index a4829d9997a..0d5cb22f74d 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@g.o>
-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@g.o>
 ---
- 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
similarity index 96%
rename from media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
rename to media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild
index ca8180bed03..2187d9d65c0 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 1c718ccc964..2187d9d65c0 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}"
@@ -37,7 +37,7 @@ DEPEND="${PYTHON_DEPS}
 		   )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-Use-usr-for-vulkan-headers.patch"
+	"${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch"
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
 	 )