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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2018-05-30 23:33 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2018-05-30 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     9d3dc8eb4e8aebb1ea8c898a55e881d725cc4f10
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 23:21:58 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Wed May 30 23:32:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3dc8eb

media-libs/vulkan-layers: Update patch for 9999

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...an-layers-9999-Use-usr-for-vulkan-headers.patch | 97 ++++++++++++++++++++++
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  2 +-
 2 files changed, 98 insertions(+), 1 deletion(-)

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 00000000000..3ce12135039
--- /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 ca8180bed03..1c718ccc964 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"
 	 )
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2018-07-07 17:56 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2018-07-07 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     a56846aa6198c91ec9bd380d18e4da93646120df
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 17:50:47 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 17:52:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56846aa

media-libs/vulkan-layers: Backport patch to fix build on 1.1.77.0

Same issue as media-libs/vulkan-loader-1.1.77.0

Bug: https://bugs.gentoo.org/658900
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 ...1.77.0-layers-Rework-include-dependencies.patch | 68 ++++++++++++++++++++++
 .../vulkan-layers/vulkan-layers-1.1.77.0.ebuild    |  3 +-
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  2 +-
 3 files changed, 71 insertions(+), 2 deletions(-)

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 00000000000..d0b48a749c2
--- /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 <lenny@lunarg.com>
+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 <Sarnex@gentoo.org>
+
+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 <signal.h>
+ #include <cinttypes>
+ #include <stdarg.h>
+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 <unordered_map>
+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 <vulkan/vulkan.h>\n'
+         preamble += '#include <vulkan/vk_layer.h>\n'
+         preamble += '#include <string.h>\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/vulkan-layers-1.1.77.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
index 436c46fc525..cbe189ea63c 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 436c46fc525..b2e238baddb 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}]


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2018-09-18  0:19 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2018-09-18  0:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c7264ea95258abcf25c58fa66c289011bd19ee7d
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 00:18:24 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 00:18:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7264ea9

media-libs/vulkan-layers: Remove unnecessary patch

I had 1.1.84.0 headers installed accidentally

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 ...2.0-Modify-scripts-to-accomodate-new-exts.patch | 23 ----------------------
 .../vulkan-layers/vulkan-layers-1.1.82.0.ebuild    |  1 -
 2 files changed, 24 deletions(-)

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch
deleted file mode 100644
index 45da36c66c7..00000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 7bd8575b65e6a7ab9954cf30dcaff398bf9246e9 Mon Sep 17 00:00:00 2001
-From: Shannon McPherson <shannon@lunarg.com>
-Date: Mon, 10 Sep 2018 11:13:02 -0600
-Subject: [PATCH] scripts: Modify scripts to accomodate new exts
-
-Parameter validation was not gathering and processing structure
-information correctly for one of the 84 Headers extensions
----
- scripts/parameter_validation_generator.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
-index 8bb8da382..b157a1578 100644
---- a/scripts/parameter_validation_generator.py
-+++ b/scripts/parameter_validation_generator.py
-@@ -711,6 +711,7 @@ def genVkStructureType(self, typename):
-         # Add underscore between lowercase then uppercase
-         value = re.sub('([a-z0-9])([A-Z])', r'\1_\2', typename)
-         value = value.replace('D3_D12', 'D3D12')
-+        value = value.replace('ASTCDecode', 'ASTC_Decode')
-         value = value.replace('Device_IDProp', 'Device_ID_Prop')
-         value = value.replace('LODGather', 'LOD_Gather')
-         value = value.replace('Features2', 'FEATURES_2')

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
index af1263d167f..c1a86b1bc3a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
@@ -38,7 +38,6 @@ DEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
-	"${FILESDIR}/${PN}-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch"
 	 )
 
 multilib_src_configure() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2020-03-19  4:51 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2020-03-19  4:51 UTC (permalink / raw
  To: gentoo-commits

commit:     be543b3840affdfcff76472b80cf94f46d3b78cc
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 04:49:18 2020 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 04:49:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be543b38

media-libs/vulkan-layers: Backport build fix

Closes: https://bugs.gentoo.org/712800
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../files/vulkan-layers-1.2.133-Fix-build.patch    | 22 ++++++++++++++++++++++
 .../vulkan-layers/vulkan-layers-1.2.133-r1.ebuild  |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
new file mode 100644
index 00000000000..c3f42539bbe
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
@@ -0,0 +1,22 @@
+From 511b30622aa9e7859e5b606b25621a8d84888d40 Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Wed, 18 Mar 2020 20:23:13 +0100
+Subject: [PATCH] layers: Update range_vector.h
+
+Change-Id: I595fb8b5ccf102d652e86846cbf8489c79a1c8e0
+---
+ layers/range_vector.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/layers/range_vector.h b/layers/range_vector.h
+index 5d650586a..37de88ee7 100644
+--- a/layers/range_vector.h
++++ b/layers/range_vector.h
+@@ -28,6 +28,7 @@
+ #include <limits>
+ #include <map>
+ #include <utility>
++#include <cstdint>
+ 
+ #define RANGE_ASSERT(b) assert(b)
+ 

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
index aca531469b7..83a0302f2c1 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="${PYTHON_DEPS}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-build.patch" )
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2020-06-17  5:46 Matt Turner
  0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2020-06-17  5:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4a4aa45bdb8510934d3a7a79c5b0327c9a2cc3ea
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 05:39:09 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 05:45:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4aa45b

media-libs/vulkan-layers: Drop old versions

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  3 --
 .../files/vulkan-layers-1.2.133-Fix-build.patch    | 22 ---------
 .../vulkan-layers/vulkan-layers-1.1.125-r2.ebuild  | 49 --------------------
 .../vulkan-layers/vulkan-layers-1.2.133-r1.ebuild  | 54 ----------------------
 .../vulkan-layers/vulkan-layers-1.2.135.ebuild     | 52 ---------------------
 5 files changed, 180 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 6f571390122..64832b17385 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,5 +1,2 @@
-DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0
-DIST vulkan-layers-1.2.133a.tar.gz 1864458 BLAKE2B 8da19effe360dfdd7b4896407a62870c825bed62aafc3fe68dc0ca7d9fb92dc7d9337101b9e46535ae901ec24f8d4f6d0301c4e72a5c29ebdf4f28e07e4c49ba SHA512 a7fe404f8732486c12ddee0443649fc5a5b4a67bb255a439d8f55939b171e447f5711632726eaca0e492bd6ab80e3ebd7efd3156e8bd0fc5b15dcec8b791301f
-DIST vulkan-layers-1.2.135.tar.gz 1963632 BLAKE2B 89069971266d0797e57f868ad996218d555687a40878b5d5cbf37dcbc392316e53066e8d457fb7b2505727b6529c217d8d6118b45c76416bf8dab7830d2d6818 SHA512 44a660b4c3bfa6f5ea355d7d1121f239c92e96cf2ef941d85b0d4a12154c4bec218b4c4c19e18c7a42cbb03a468f90ffcd6752ec773a8223e67cc182e1e96324
 DIST vulkan-layers-1.2.137.tar.gz 2002707 BLAKE2B d26ae5289a551bc8a42ef431b7c57340a96b049359b8ed9088b1e6e9d5cb101bd05e6ca089a16bd6c88e71f0b353796f5eb407236868357ee1136f5206343a5b SHA512 c3d0039cd49d91890bfeff24f3df536170d3072db333b7438b92a22b0385634051e2309133d100ab0d22150eeea57a21190ba5eacbce5293983fd280bcf83045
 DIST vulkan-layers-1.2.141.tar.gz 2046629 BLAKE2B 03f334b365e39d3e89c3896e1eb407876c4f56841e64f25b267c66e37478825519b41599d228a4d65b89a49ecf806c92270d43016c40d562c0ec4ea053f78f2c SHA512 482594bdcd780276f9b7b42256951c143b798f2de2be8e54515aece30fd94fc0f913fc52f5b5cc6d8a9b5f38eb345b941a1853532df9d3e6c686fa6f79e8a5ac

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
deleted file mode 100644
index c3f42539bbe..00000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 511b30622aa9e7859e5b606b25621a8d84888d40 Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Wed, 18 Mar 2020 20:23:13 +0100
-Subject: [PATCH] layers: Update range_vector.h
-
-Change-Id: I595fb8b5ccf102d652e86846cbf8489c79a1c8e0
----
- layers/range_vector.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/layers/range_vector.h b/layers/range_vector.h
-index 5d650586a..37de88ee7 100644
---- a/layers/range_vector.h
-+++ b/layers/range_vector.h
-@@ -28,6 +28,7 @@
- #include <limits>
- #include <map>
- #include <utility>
-+#include <cstdint>
- 
- #define RANGE_ASSERT(b) assert(b)
- 

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
deleted file mode 100644
index 5c8a22273cf..00000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
-	KEYWORDS="amd64 ~ppc64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="X wayland"
-
-DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}]
-		~dev-util/spirv-tools-2019.10_pre20191027:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.125
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_LAYER_SUPPORT_FILES=True
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=False
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
-	)
-	cmake-utils_src_configure
-}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
deleted file mode 100644
index b8a19367f7b..00000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}a.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-7.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.1:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-build.patch" )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-	)
-	cmake_src_configure
-}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild
deleted file mode 100644
index 716f47b5b7c..00000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.1:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-	)
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2022-02-20  2:09 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2022-02-20  2:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a09c70e699b3a2abdf6b222d79f7db916690d96e
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 21:58:18 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 02:09:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09c70e6

media-libs/vulkan-layers: Version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 +
 ...ayers-1.3.204-Dont-use-static-spirv-tools.patch | 27 +++++++
 ...n-layers-1.3.204-Fix-dependency-detection.patch | 90 ++++++++++++++++++++++
 ...rs-9999.ebuild => vulkan-layers-1.3.204.ebuild} | 12 ++-
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  4 +-
 5 files changed, 128 insertions(+), 6 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 53a0a76e7a55..246391f920ad 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1,2 @@
 DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
+DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
new file mode 100644
index 000000000000..791ac6764bce
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
@@ -0,0 +1,27 @@
+From 68f030f9e776d1f2549e471f40c9794f6056bb05 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Sat, 19 Feb 2022 20:41:44 -0500
+Subject: [PATCH] Dont use static spirv-tools
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ layers/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 59e294a07..5d30a9834 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -310,7 +310,7 @@ if(BUILD_LAYERS)
+         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
+     endif()
+     target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+-    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
++    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt)
+ 
+ 
+     # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled
+
+-- 
+2.35.1
+

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
new file mode 100644
index 000000000000..25f3b4bafd27
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
@@ -0,0 +1,90 @@
+From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001
+From: Jeremy Gebben <jeremyg@lunarg.com>
+Date: Thu, 17 Feb 2022 15:26:25 -0700
+Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations
+
+If the SPIRV-Headers package is not found, fall back to looking for
+headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR.
+
+Fixes #3765
+---
+ CMakeLists.txt        | 19 ++++++++++++++++---
+ layers/CMakeLists.txt |  7 +------
+ tests/CMakeLists.txt  |  6 +++---
+ 3 files changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d4ca786ca07..58a966f03d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING)
+     endif()
+ endif()
+ 
+-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "")
+ if(BUILD_LAYERS OR BUILD_TESTS)
+-    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
+-        find_package(SPIRV-Headers REQUIRED CONFIG)
++    find_package(SPIRV-Headers CONFIG QUIET)
++    if(SPIRV-Headers_FOUND)
++	# pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed'
++	# version of SPIRV-Headers, the package will be found.
++	get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
++    elseif(SPIRV_HEADERS_INCLUDE_DIR)
++	# This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory
++	if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h")
++	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}")
++        endif()
++    elseif(SPIRV_HEADERS_INSTALL_DIR)
++        # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers
++	if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h")
++	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}")
++        endif()
++	set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include")
+     endif()
+ endif()
+ 
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 6edcf6eb5ab..59e294a0793 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -309,12 +309,7 @@ if(BUILD_LAYERS)
+     if (USE_ROBIN_HOOD_HASHING)
+         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
+     endif()
+-    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
+-        target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers)
+-    else()
+-        target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+-    endif()
+-
++    target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+     target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
+ 
+ 
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 2b98d109b7f..780c0538486 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # ~~~
+-# Copyright (c) 2014-2021 Valve Corporation
+-# Copyright (c) 2014-2021 LunarG, Inc.
++# Copyright (c) 2014-2022 Valve Corporation
++# Copyright (c) 2014-2022 LunarG, Inc.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+@@ -149,11 +149,11 @@ if (NOT MSVC)
+     target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare")
+ endif()
+ 
++target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+ # Specify target_link_libraries
+ target_link_libraries(vk_layer_validation_tests
+                       PRIVATE VkLayer_utils
+                               ${GLSLANG_LIBRARIES}
+-			      SPIRV-Headers::SPIRV-Headers
+ 			      SPIRV-Tools-static SPIRV-Tools-opt
+ 			      GTest::gtest GTest::gtest_main)
+ 

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
similarity index 84%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
index 5beaf4f6dc7a..2288a824c1fd 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,15 +21,20 @@ fi
 DESCRIPTION="Vulkan Validation Layers"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Fix-dependency-detection.patch
+	"${FILESDIR}"/${P}-Dont-use-static-spirv-tools.patch
+)
+
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
+	>=dev-cpp/robin-hood-hashing-3.11.5
 	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
 	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
@@ -51,7 +56,6 @@ multilib_src_configure() {
 		-DBUILD_TESTS=OFF
 		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
 	)
 	cmake_src_configure
 }

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 5beaf4f6dc7a..b4edb5a84d37 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ BDEPEND=">=dev-util/cmake-3.10.2"
 RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
+	>=dev-cpp/robin-hood-hashing-3.11.5
 	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
 	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2022-11-24 15:49 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2022-11-24 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8a5255d01d4eda811fd26e1be4124b06c34bff33
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 15:48:40 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 15:49:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5255d0

media-libs/vulkan-layers: You have got to be kidding me

Bug: https://bugs.gentoo.org/882727

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 ...yers-1.3.231-Make-BUILD_WERROR-actually-work.patch | 19 +++++++++++++++++++
 media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch
new file mode 100644
index 000000000000..4bd9abf89a87
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e3985fc6d..ea8d47bb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,14 +170,6 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+                         -fno-strict-aliasing
+                         -fno-builtin-memcmp)
+ 
+-    # Treat warnings as errors for versions of GCC and c++11-compliant Clang versions that are shipped on Ubuntu 18.04 or older.
+-    if(BUILD_WERROR OR
+-      (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 7.3.0) OR
+-      (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0))
+-        add_compile_options(-Werror)
+-    endif()
+-
+-
+     set(CMAKE_C_STANDARD 99)
+ 
+     # For GCC version 7.1 or greater, we need to disable the implicit fallthrough warning since there's no consistent way to satisfy

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
index 8858c9eb415a..aaf3971f38e8 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild
@@ -24,7 +24,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
 
-PATCHES=( "${FILESDIR}/${P}-cmake-Cleanup-find_package-SPIRV-code.patch" )
+PATCHES=( "${FILESDIR}/${P}-cmake-Cleanup-find_package-SPIRV-code.patch"
+	"${FILESDIR}/${P}-Make-BUILD_WERROR-actually-work.patch"
+)
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2022-12-30  1:30 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2022-12-30  1:30 UTC (permalink / raw
  To: gentoo-commits

commit:     f4a4dc629b10f2bf722ae8585c04173760bbcb76
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 01:27:59 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 01:30:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a4dc62

media-libs/vulkan-layers: Only build shared libs

Closes: https://bugs.gentoo.org/888831

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../vulkan-layers-1.3.236-Build-shared-libs.patch  | 26 ++++++++++++++++++++++
 ....236.ebuild => vulkan-layers-1.3.236-r1.ebuild} |  2 ++
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  2 ++
 3 files changed, 30 insertions(+)

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
new file mode 100644
index 000000000000..18cedb517b09
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f29022f96..cf34d8e21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -255,7 +255,7 @@ endif()
+ # files directly in layers.
+ 
+ add_library(VkLayer_utils
+-            STATIC
++            SHARED
+             layers/vk_layer_config.cpp
+             layers/vk_layer_extension_utils.cpp
+             layers/vk_layer_utils.cpp
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 96d52b5f8..3f75aa3a8 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -226,7 +226,7 @@ if (NOT BUILD_LAYERS)
+     return()
+ endif()
+ 
+-add_library(VkLayer_khronos_validation MODULE)
++add_library(VkLayer_khronos_validation SHARED)
+ 
+ target_sources(VkLayer_khronos_validation PRIVATE
+     ${CHASSIS_LIBRARY_FILES}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
similarity index 96%
rename from media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
rename to media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
index 4651b8594c3a..03f4800769a6 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch"
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 6496c1088d7c..7d5abc1f9f75 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES="${FILESDIR}/${PN}-1.3.236-Build-shared-libs.patch"
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2023-03-08  2:36 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2023-03-08  2:36 UTC (permalink / raw
  To: gentoo-commits

commit:     d4506f3dc49c83b97c8ed34d094035965e958a32
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 02:32:46 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 02:33:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4506f3d

media-libs/vulkan-layers: Export more symbols

Closes: https://bugs.gentoo.org/895348

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../files/vulkan-layers-1.3.239-Export-symbols.patch        | 13 +++++++++++++
 ...n-layers-9999.ebuild => vulkan-layers-1.3.239-r1.ebuild} |  6 ++++--
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild          |  4 +++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Export-symbols.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Export-symbols.patch
new file mode 100644
index 000000000000..54a1f5f8393c
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Export-symbols.patch
@@ -0,0 +1,13 @@
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 640ac8471..043d313fd 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -24,7 +24,7 @@
+ add_compile_definitions(XXH_NO_LONG_LONG)
+ 
+ add_library(VkLayer_utils SHARED)
+-target_sources(VkLayer_utils PRIVATE
++target_sources(VkLayer_utils PUBLIC
+     generated/vk_format_utils.h
+     generated/vk_format_utils.cpp
+     generated/vk_validation_error_messages.h

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
similarity index 90%
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild
copy to media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
index 2a018ab0cf3c..77df77e94be3 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
 
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
@@ -37,7 +37,9 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch"
+PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch
+	${FILESDIR}/${P}-Export-symbols.patch
+"
 
 multilib_src_configure() {
 	local mycmakeargs=(

diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 2a018ab0cf3c..3bdb7b185bb7 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -37,7 +37,9 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch"
+PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch
+${FILESDIR}/${PN}-1.3.239-Export-symbols.patch
+"
 
 multilib_src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2023-05-12 22:34 Matt Turner
  0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2023-05-12 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ab68bc63579317eb07515c6d35c90a51d4ddd550
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 22:09:48 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 12 22:34:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab68bc63

media-libs/vulkan-layers: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 -
 .../vulkan-layers-1.3.239-Build-shared-libs.patch  | 22 --------
 .../vulkan-layers-1.3.239-Export-symbols.patch     | 13 -----
 .../vulkan-layers/vulkan-layers-1.3.239-r1.ebuild  | 57 ---------------------
 .../vulkan-layers/vulkan-layers-1.3.239-r2.ebuild  | 59 ----------------------
 .../vulkan-layers/vulkan-layers-1.3.239.ebuild     | 55 --------------------
 6 files changed, 207 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 7981d6dbe553..57b88025edf1 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1 @@
-DIST vulkan-layers-1.3.239.tar.gz 4549587 BLAKE2B b5ac5afade60b048414a336dc130ae2e7c332e1a9e4b86448be9c86f17f7705990b27908721ee2f62e3425f117d3941f47525f8fa0d07e79bc3c68f7e4e48f14 SHA512 4b96951874e5b7c7abbab83b0b85cfe10b13d3ced20148ddcdd9b6e79db5d083b9ee00ae1c3605a72bcea4c3b8f1ab42ed284eb2cbc8f7e98d377108970e884c
 DIST vulkan-layers-1.3.243.tar.gz 4624249 BLAKE2B d358ccf3dbe690d7f30e153271602b4ab14d55a854169fa828a4bc8ffeb688531b4b4703dbe7ea4e038237db650a923ab9f618178a5edf304fc4a3170be57238 SHA512 d2bba9afc2013ccd41953eb699e9568c85f90bb99d1be9866126a8bc18ae492e55970acc2ca4d7b9850b0201b0451acbb5335ea19dcd030dc71d545feb261a19

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch
deleted file mode 100644
index f290164555a5..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 640ac8471..19caed0ed 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -23,7 +23,7 @@
- # https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640
- add_compile_definitions(XXH_NO_LONG_LONG)
- 
--add_library(VkLayer_utils STATIC)
-+add_library(VkLayer_utils SHARED)
- target_sources(VkLayer_utils PRIVATE
-     generated/vk_format_utils.h
-     generated/vk_format_utils.cpp
-@@ -158,7 +158,7 @@ else()
-     message(NOTICE "VulkanVL_generated_source target requires python 3")
- endif()
- 
--add_library(VkLayer_khronos_validation MODULE)
-+add_library(VkLayer_khronos_validation SHARED)
- 
- target_sources(VkLayer_khronos_validation PRIVATE
-     generated/best_practices.cpp

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Export-symbols.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Export-symbols.patch
deleted file mode 100644
index 54a1f5f8393c..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Export-symbols.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 640ac8471..043d313fd 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -24,7 +24,7 @@
- add_compile_definitions(XXH_NO_LONG_LONG)
- 
- add_library(VkLayer_utils SHARED)
--target_sources(VkLayer_utils PRIVATE
-+target_sources(VkLayer_utils PUBLIC
-     generated/vk_format_utils.h
-     generated/vk_format_utils.cpp
-     generated/vk_validation_error_messages.h

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
deleted file mode 100644
index 63ff852438cf..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch
-	${FILESDIR}/${P}-Export-symbols.patch
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild
deleted file mode 100644
index fa2ffd709370..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${PF}-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name \*.a -delete || die
-}

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
deleted file mode 100644
index c9a23ee7d23b..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2023-06-12  1:24 Nick Sarnie
  0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2023-06-12  1:24 UTC (permalink / raw
  To: gentoo-commits

commit:     4078b18a15a625d775f4d47efc7c7ad0df82b84d
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 01:12:24 2023 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 01:21:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4078b18a

media-libs/vulkan-layers: add 1.3.250

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 +
 .../vulkan-layers-1.3.250-Build-shared-libs.patch  | 13 +++++
 .../vulkan-layers/vulkan-layers-1.3.250.ebuild     | 59 ++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 002f314f576d..1a62bfabe200 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-layers-1.3.243.tar.gz 4624249 BLAKE2B d358ccf3dbe690d7f30e153271602b4ab14d55a854169fa828a4bc8ffeb688531b4b4703dbe7ea4e038237db650a923ab9f618178a5edf304fc4a3170be57238 SHA512 d2bba9afc2013ccd41953eb699e9568c85f90bb99d1be9866126a8bc18ae492e55970acc2ca4d7b9850b0201b0451acbb5335ea19dcd030dc71d545feb261a19
 DIST vulkan-layers-1.3.246.tar.gz 4750578 BLAKE2B df6c51756231d50866b8a676ae6f62f79ba361155c7c1009fa4e62b921aa4ef7434140ec6ae82ab773e3e01c74b1213175ac2156a8a79adf212760786853aa5e SHA512 2c0f9ed198a1a806e564072057d2d0e42eb8e42ae5fc847399fa5eb8227ef52a0114f47569fa49f0bfbcb210530bea658558fbc27451c972681eb9ee79099c6d
+DIST vulkan-layers-1.3.250.tar.gz 4829919 BLAKE2B 9e05c53d283df1d57c20574224333249e468242eb73f7feb9ce47b4d194a80a1b1958bc71743eed3d108cedba972eeb9aa27ef33e838828e8a0baefe85254613 SHA512 5e8aef501961b49d7b4390d8c8ce09fe0b7657d323859d2052a8a14b042da69d7b1387a8aadede8372711313518b6d75fb78f41e2e0c1ad69c99a5b58524fb82

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch
new file mode 100644
index 000000000000..0a5e242a542a
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 06b53ff9b..97e388765 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -166,7 +166,7 @@ if (VVL_CODEGEN)
+     )
+ endif()
+ 
+-add_library(vvl MODULE)
++add_library(vvl SHARED)
+ 
+ target_sources(vvl PRIVATE
+     best_practices/best_practices_error_enums.h

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.250.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.250.ebuild
new file mode 100644
index 000000000000..7af48d11e398
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.250.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{9..12} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/
@ 2024-05-16 17:18 Matt Turner
  0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2024-05-16 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     06e92ee9264a66673ba2798b0a1d64d7c4e1c4ea
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 17:11:32 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 16 17:18:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e92ee9

media-libs/vulkan-layers: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/vulkan-layers/Manifest                  |  1 -
 .../vulkan-layers-1.3.250-Build-shared-libs.patch  | 13 -----
 .../vulkan-layers/vulkan-layers-1.3.275.ebuild     | 60 ----------------------
 3 files changed, 74 deletions(-)

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index ad5053fa567b..5da3f3b85a8b 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,3 +1,2 @@
-DIST vulkan-layers-1.3.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
 DIST vulkan-layers-1.3.280.0.tar.gz 5465068 BLAKE2B c0b568b59cb8a17bea7dd1c1522c0a72279ad6a07f2f11383bc069f141fbb179529dd4ccd34b2a7a9a9a4af0e173ebbc49541a42c2b32ea8b54d90302f7ee449 SHA512 b397d4aa5406e25eb241a72f006fb05554d8ec96eec4c31ed08ef34d0b362f8e544a2e8bcf044112bdbb2733f2a9f50bf8b63aff64e143e450fa01298dc7838a
 DIST vulkan-layers-1.3.283.0.tar.gz 5230566 BLAKE2B c16a4af62900a4b053f7dd60da5279bc088cd297f22bc247be2718cc3187136b60e90530298c068fdd384c9135e83f91f3ffd7b3db9f12555d6dd88b6e9b66ef SHA512 fc2ca2c79be8e01fc39a7802644d5e10b5196317eaac246a17b73093409739e771ac267c1ed8aad08ba68afdebc583702980f195a5f93421a0c041da3f4b6e49

diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch
deleted file mode 100644
index 0a5e242a542a..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 06b53ff9b..97e388765 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -166,7 +166,7 @@ if (VVL_CODEGEN)
-     )
- endif()
- 
--add_library(vvl MODULE)
-+add_library(vvl SHARED)
- 
- target_sources(vvl PRIVATE
-     best_practices/best_practices_error_enums.h

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild
deleted file mode 100644
index c9810ee2b3ef..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/spirv-headers-${PV}
-	~dev-util/vulkan-headers-${PV}
-	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name \*.a -delete || die
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-05-16 17:18 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-24 15:49 [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/ Nick Sarnie
  -- strict thread matches above, loose matches on Subject: below --
2024-05-16 17:18 Matt Turner
2023-06-12  1:24 Nick Sarnie
2023-05-12 22:34 Matt Turner
2023-03-08  2:36 Nick Sarnie
2022-12-30  1:30 Nick Sarnie
2022-02-20  2:09 Nick Sarnie
2020-06-17  5:46 Matt Turner
2020-03-19  4:51 Nick Sarnie
2018-09-18  0:19 Nick Sarnie
2018-07-07 17:56 Nick Sarnie
2018-05-30 23:33 Nick Sarnie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox