commit: f3cc0e774e3a6aca04fd98c8c5b2d8b7d08d12a2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Jul 22 17:09:46 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Jul 22 17:15:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3cc0e77
media-libs/vulkan-layers: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/vulkan-layers/Manifest | 3 -- ...e-a-file-to-get-the-spirv-tools-commit-ID.patch | 40 ---------------- .../vulkan-layers/vulkan-layers-1.1.101.ebuild | 48 -------------------- .../vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild | 53 ---------------------- .../vulkan-layers/vulkan-layers-1.1.92.0-r1.ebuild | 48 -------------------- 5 files changed, 192 deletions(-) diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 0db1b0e8f60..73acc6933d7 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,4 +1 @@ -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 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 7688eb8d5cf..00000000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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 cee610cca79..00000000000 --- 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.82.0-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0-r1.ebuild deleted file mode 100644 index bc580d74643..00000000000 --- 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 00a214d8900..00000000000 --- 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 -}
