summaryrefslogtreecommitdiff
path: root/media-libs/vulkan-layers
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
commitb24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /media-libs/vulkan-layers
parent121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
gentoo resync : 02.08.2019
Diffstat (limited to 'media-libs/vulkan-layers')
-rw-r--r--media-libs/vulkan-layers/Manifest11
-rw-r--r--media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch40
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild48
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild2
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild53
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild48
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-9999.ebuild2
7 files changed, 4 insertions, 200 deletions
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 1787e82165b5..ca612b056441 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,11 +1,4 @@
-AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
-DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498686e1035e69b4d51f36ffdfc179b36323850d1004759941dfaa6ae8e6a25cc909d041e840a589d102f82086f339bfaa1c6 SHA512 d962483ab7149d436ac1bafb65d26ae965e147b7bd0dfd610b35cd54598ee84cb961c472d824a33964b117a14f224c984cf73764aef4de787de13b0a1ad29c4a
DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027
-DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
-DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
-EBUILD vulkan-layers-1.1.101.ebuild 1397 BLAKE2B d1e42df59eb04d9f6e42f67e5c130038fcd88e52e88ab328c280d69fe4abb8ed7368699c11d2ff5eeffd21d6adda1964703859274d24db7bb6b9eb9e17d1f449 SHA512 3736990ec0e948a1840ecf7bfb7f2545024aa5b429969220a1a1d55137bcdbbb80b8e8369eece097ca6342513ac8c72f50137116b156b7eed081874de398821f
-EBUILD vulkan-layers-1.1.106.ebuild 1409 BLAKE2B 63eb47c0d571a185626a984c368bcf6c9c7f24d5a71d74c94148b631732fb874a6a38d67ea7ddc8a07de6335e59181d2cd64a94d6f646527a0b5369d59ddb4fa SHA512 38e45b08f2c2bfdb1913da715cb6d6d063c59e20321c2c993025668b462a5e6d799acc48ffbee48593de06ca61c8b8f1ad60715d9de15f0f5fb9214bb7ee2e6d
-EBUILD vulkan-layers-1.1.82.0-r1.ebuild 1511 BLAKE2B 2807d2a7bb147049ceac792aca00a76ed67dd623d0680b7672ef926f9b36d48cd08ec2601d4ae96d747704221bda2f0e2e8a095c7bf6159decf5203be9bf39b9 SHA512 285690f105861791073332f918f16798b24853f22e98eae48e57604cac4c17351721746efa9f613e3b26dd801a2092137de20e7208d7acb066103bd1d233da3d
-EBUILD vulkan-layers-1.1.92.0-r1.ebuild 1393 BLAKE2B 9560cb9f3dacad4ae5002c8fab1f6c37ddbc23729fcea6352234f82535a9b1da43aaa7338118880dc62d30f67a349aa110d4e530044ed1f5498a631635e0ef4f SHA512 3dd3ea7d31947f73da6cd9bad8ea8b94756943af87be0fbb2326aeab76f1bd2e6fb57019935f367f74ffee7a9c0bfe1643eb3018fa5698a3ab381b03fb437829
-EBUILD vulkan-layers-9999.ebuild 1405 BLAKE2B 9e964a27c5a56ed5aa73d081feb5a4943d69826e6499a8e2595a352172caab45eb9d1c933c0c4471e2b9bf8b6efa798559937e3b41acbf7cc539afe444c95820 SHA512 8bb329d435bdae6e431f98649817f1a1070784e8ddf5d58b5117f821b71e302f8e1c45ea8e65a8f62432af4ebecf3e66e82063a93954cf36633e3f4b8844b620
+EBUILD vulkan-layers-1.1.106.ebuild 1408 BLAKE2B deba604fcd8171d7ea1b27f496bab561659073d3405e655561570ff11d74a92b091a8eb78b19eb8335b5a32cb2466f609b0750c873ed981afac71245aa866a82 SHA512 ffb87f7a8a1843b60b28218ad413d51e9673a5d659ce9e6eb5c1b197d7a395b991561d109ba62413b9188b902e61503080095c0251b749289d02aaece92abd7e
+EBUILD vulkan-layers-9999.ebuild 1410 BLAKE2B 79c5abc89ee6e21e80d89ddc58d1bba03f233a381802b06096dea9997f4eaa262e1545da91c696e840409f1ae2cefc106a1cf7994e6905e9e64e785d541be573 SHA512 b44ee188f0bb8af2bb61ad4adabda57e8bd45396346f809d750cb801b1158989a958932bf2e6e8433ddc854d7541d6596767a8fffc3533d77246ae85205c6835
MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
deleted file mode 100644
index 7688eb8d5cf6..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2bcf0e5097070532ebfb0bf0ee0b28e1065be1e8 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Tue, 22 May 2018 20:11:17 -0400
-Subject: [PATCH] Use a file to get the spirv-tools commit ID
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- layers/CMakeLists.txt | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 5b3758d1..2a9c2f32 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -51,6 +51,13 @@ macro(run_external_revision_generate symbol_name output)
- )
- endmacro()
-
-+macro(run_external_revision_generate_spirv_tools source_dir symbol_name output)
-+ add_custom_command(OUTPUT ${output}
-+ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output}
-+ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h
-+ )
-+endmacro()
-+
- # Custom targets for generated validation layer helper file dependencies
- add_custom_target(spirv_tools_revision_file DEPENDS
- spirv_tools_commit_id.h
-@@ -78,7 +85,7 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
- run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
- run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
- if(BUILD_LAYERS)
-- run_external_revision_generate(SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
-+ run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
- endif()
-
- # Layer Utils Library
---
-2.17.0
-
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
deleted file mode 100644
index cee610cca79a..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- EGIT_COMMIT="f06d731b7caf3e446acef3f4f5e62bdecd6f73d6"
- KEYWORDS="~amd64 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.10.2984:=[${MULTILIB_USEDEP}]
- >=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
- >=dev-util/vulkan-headers-1.1.101
- 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_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.1.106.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
index 51564a729aab..6aced6feec5a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
EGIT_COMMIT="21638dfbe1f15091659a722a805c9020e87ddf49"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
fi
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
deleted file mode 100644
index bc580d746434..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
- KEYWORDS="~amd64"
- 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.9.2888:=[${MULTILIB_USEDEP}]
- >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
- >=dev-util/vulkan-headers-1.1.82.0
- wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11:=[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
- )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=True
- -DBUILD_WSI_MIR_SUPPORT=False
- -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.1.92.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
deleted file mode 100644
index 00a214d89007..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- EGIT_COMMIT="6e6da6ccab8931f7c30815966ef839b1155e5bec"
- KEYWORDS="amd64"
- 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.10.2984:=[${MULTILIB_USEDEP}]
- >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
- >=dev-util/vulkan-headers-1.1.92.0
- 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_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-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 5e0a2448e380..0858c0d8f899 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 15:06:42 +0000