From 2480f36bfb3d39469cc44843d1fe664bd40443a3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Jul 2022 14:44:25 +0100 Subject: gentoo auto-resync : 21:07:2022 - 14:44:25 --- dev-util/Manifest.gz | Bin 67954 -> 67955 bytes dev-util/glslang/Manifest | 2 +- dev-util/glslang/glslang-1.3.216.ebuild | 2 +- dev-util/spirv-headers/Manifest | 2 - .../spirv-headers/spirv-headers-1.3.211.ebuild | 17 ----- dev-util/spirv-tools/Manifest | 3 - .../files/spirv-tools-1.3.211-cmake-librt.patch | 40 ---------- dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild | 49 ------------ dev-util/vulkan-headers/Manifest | 4 +- .../vulkan-headers/vulkan-headers-1.3.211.ebuild | 24 ------ .../vulkan-headers/vulkan-headers-1.3.216.ebuild | 2 +- dev-util/vulkan-tools/Manifest | 4 +- dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild | 83 --------------------- dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild | 2 +- 14 files changed, 6 insertions(+), 228 deletions(-) delete mode 100644 dev-util/spirv-headers/spirv-headers-1.3.211.ebuild delete mode 100644 dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch delete mode 100644 dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild delete mode 100644 dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild delete mode 100644 dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index bb621e27c4fc..3194e4df6771 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index 9253e1b93bd5..b97a6bf31568 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,6 +1,6 @@ DIST glslang-1.3.211.tar.gz 3533816 BLAKE2B 87acf456f365fb02160bfd6abada4664f841cec6d6afd0472d0a337083ab371ce8a98e75323c9cf1342a1e04be53d1ebc7b265e591d22fab572c407d84208a1e SHA512 d2dce0938f77d1c7736db0ba97e557fd79f4efc944a489662bbce66bee923a31554ef73099087853779bba72fc2aae53e4bb2d6fb0a69cb13e4f24c5a789bb64 DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8 EBUILD glslang-1.3.211.ebuild 830 BLAKE2B fe12a1c714e8d88bd876fa9363fad5ee8c2acef99bf23be4a55a898aff387e97cf1a4c642f8c016423c7fb404f7b18a45a092aef37814337edd39df79d652279 SHA512 f504ff987e188cd09564af989a580e0009c6366a7d5df5f1c628f0824c6f5bcf9259b2fca302857380c21a7fec5ad0f7e4eb9a1cfb4182e03d53d6ef0c232d01 -EBUILD glslang-1.3.216.ebuild 831 BLAKE2B eb9ebcd1c153b1407055f4d766049e843c132904382a366ec56186f8fde7f6c9711c0e97b4653ef0c749d9ad3cc8f5a258d2def889a7b92334a6c8766a4cab2c SHA512 17d30844048e57edf4288785b71a5901f02a31e36f99434a12495115d7269862ab6de09e3fd62417d12dad2e27819db5d01bc465d8f806fc13ed515f5b66ce4c +EBUILD glslang-1.3.216.ebuild 830 BLAKE2B fe12a1c714e8d88bd876fa9363fad5ee8c2acef99bf23be4a55a898aff387e97cf1a4c642f8c016423c7fb404f7b18a45a092aef37814337edd39df79d652279 SHA512 f504ff987e188cd09564af989a580e0009c6366a7d5df5f1c628f0824c6f5bcf9259b2fca302857380c21a7fec5ad0f7e4eb9a1cfb4182e03d53d6ef0c232d01 EBUILD glslang-9999.ebuild 836 BLAKE2B b5ac9e079171df999633b0124bb92fa4a76b3feef2ed491222d9bbd2d9fdaf53c68aa1e9f1129899b2181d8d1e38bda251a16d023127bd46f8d96e60fb0e90e1 SHA512 cafc5a4f2b68adf8e08dfec02b5446edda0317ff0daba8368d55435f72f6afb7c6d39b4a96da688bd5f992d73e1a5b69feb21a4b3c86810051e5121ea9f8adcb MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764 diff --git a/dev-util/glslang/glslang-1.3.216.ebuild b/dev-util/glslang/glslang-1.3.216.ebuild index c722bcfca9e5..69a871b310ee 100644 --- a/dev-util/glslang/glslang-1.3.216.ebuild +++ b/dev-util/glslang/glslang-1.3.216.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then else SNAPSHOT_COMMIT="sdk-${PV}.0" SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" fi diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest index 8fde01fc5100..2eada69b6663 100644 --- a/dev-util/spirv-headers/Manifest +++ b/dev-util/spirv-headers/Manifest @@ -1,6 +1,4 @@ -DIST spirv-headers-1.3.211.tar.gz 420022 BLAKE2B 4feea5f566401aef8c1aa6d677301b6871f8af5213d1f3d257719182b4109fef37c21342e38c6170bc4252a92ea9c2c45470bb9b23425a58f0d6d883982350a9 SHA512 39357d060c9bf030e8df71e734c2adb47832d7fa1a29825305cc92b3e87770a4fe383b534b798da008168bbeedc9f659f97b58a7b13c141d4f8ac94fc329f25f DIST spirv-headers-1.3.216.tar.gz 437011 BLAKE2B df48c7709c79b2132056d51e513b564539aaba335dbd68b4849aa871b688b9db5a5ec50142b3d448fe50ce6c4e5f2016e516e9e31441c8d1ad89c90c24bfe14f SHA512 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0 -EBUILD spirv-headers-1.3.211.ebuild 492 BLAKE2B e7dd5c912375e55ca2c208570cc004dfe62af4889886b772dfe98365eb3cfdac1932107c4d1b9147cb07777ffa0cde53e1bb5e916947af8c887855f8616c00b4 SHA512 1f4037508476ca38280fa1cead6c3283c88ad4e2bdc5a083b38376b3810a9d686df388e070e2a3fb1cae7195625eb36d5f8a126fbbe8304b25b3a4ba478a5710 EBUILD spirv-headers-1.3.216.ebuild 492 BLAKE2B e7dd5c912375e55ca2c208570cc004dfe62af4889886b772dfe98365eb3cfdac1932107c4d1b9147cb07777ffa0cde53e1bb5e916947af8c887855f8616c00b4 SHA512 1f4037508476ca38280fa1cead6c3283c88ad4e2bdc5a083b38376b3810a9d686df388e070e2a3fb1cae7195625eb36d5f8a126fbbe8304b25b3a4ba478a5710 EBUILD spirv-headers-99999999.ebuild 607 BLAKE2B f94f54dc76cecce5116f6840334c3dc2b03c9b7e447765c491777562dc76cb94d2da530e4b678e7d2bde5b8b164b7aaee4421d2f05fde27c18c95e26e0fed2a0 SHA512 93a76d5a2dcb393607f194893ab1edeb28e158c22806a6bf144b345e368e57611f3114d2ad3d7b352d2c941b70ddf042b2325ed018e3cc9c4b4c5a2f7f3bde3b MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a diff --git a/dev-util/spirv-headers/spirv-headers-1.3.211.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.211.ebuild deleted file mode 100644 index 294d87e79a46..000000000000 --- a/dev-util/spirv-headers/spirv-headers-1.3.211.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Machine-readable files for the SPIR-V Registry" -HOMEPAGE="https://www.khronos.org/registry/spir-v/" -EGIT_COMMIT="sdk-${PV}.0" -SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - -S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 3b2c92175ad9..e77121bf0086 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,7 +1,4 @@ -AUX spirv-tools-1.3.211-cmake-librt.patch 1611 BLAKE2B 1199d25a4933f0d16875f9d8595ba158d84e5cbd6dadf19349667824da4d9931b6d83b9a571242c323868d5bc369f300f9ee2698da5aa65b764ed0c380fc060b SHA512 18935d1f2b520924a607bea05b4a37b371d908ebe317637fcf3d134ee7986aae1be3a8840b6ec674d9cb3dca932bc0896077b7b0660d5b3c016628cd94a7b0c5 -DIST spirv-tools-1.3.211.tar.gz 2995491 BLAKE2B 545457d097d1e00720a3f97c1f2ed0f27c7b8b6e799ac22c6adbbed7fed17edee27e13c04848db70ee08ac3319ed9a322e22a9288184651f8aa4c03df0ab4057 SHA512 df7de69779baa7ea2269cb4c9813a7d8026763f7d4f7408ea5c160ca7bd670e46e75dcbf9d99ca5f1619f37f504e695d151ede5d5cd0ef675a8898bb297c5842 DIST spirv-tools-1.3.216.tar.gz 3019645 BLAKE2B 88fed3d48f50c50276746dd2b69740482c95c83df13312e081ae4066351454f0a3afaad2f146c629ee39dd34708dd105941e2bc374146a6e9806631227372105 SHA512 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188 -EBUILD spirv-tools-1.3.211-r1.ebuild 1292 BLAKE2B c36af720c73c6cefa3b82cbaf09547c74c943319b252258c41aee64cabb1580c09ab73eb12ea5b72eab6658c41b69d339edc429b9a6f4c67771da63e78232f6d SHA512 d4d38dc7d92183cb1a8c87b842e2abe3f8f8e5068959ec741c57d7bfbbba78e006897842874f3322b1bd5b1d255484bd31c26a49ecc33cc75c284631e099dde9 EBUILD spirv-tools-1.3.216.ebuild 1241 BLAKE2B 702ac48645f31cf208d0ab9a773513ef741cae445007d1a8f41622f57d908b2b86610c12395b69203f258091b91f4686ed1373a667475cee805af1ad1e365aac SHA512 39f18ac3aabafbda41abd01a77c6bd21551793b365e58561eb6f6cc6060d738f951cb407b1e246c0ebfa86d66ce29f8b0d2ea341a8640782d0595b52d2860f7b EBUILD spirv-tools-99999999.ebuild 1249 BLAKE2B dff0362113653bdfddba4889cf457589aabb80f4ca511016e60f5d4e410ab4c8fc61498d158f589c6d88ab070c30f6ba92a8d6b6e72997010e2d017f26a6e2a3 SHA512 c95a42b3a13a8b898f70026ae1021e3cbe0f0df17068431711dba40ef562ddf7aed42194bfa287c1e3a480aa8c8c3f8645195e18d0f29bc7f52a11874a93ec13 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3 diff --git a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch b/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch deleted file mode 100644 index 48afd5a736f1..000000000000 --- a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/KhronosGroup/SPIRV-Tools/commit/cb96abbf7affd986016f17dd09f9f971138a922b - -From: Chad Versace -Date: Thu, 14 Apr 2022 06:04:12 -0700 -Subject: [PATCH] Fix CMake for librt (#4773) - -In the installed file -/usr/lib64/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake, occurences of -librt in the INTERFACE_LINK_LIBRARIES property are incorrect. The -property contains the absolute path to librt. In most situations, this -produces no problem. But when building in a sysroot, which is commonly -done when cross-compiling, the absolute path breaks dependent projects. - -For example, when building spirv-tools using the Chrome OS SDK, and -targeting the board 'volteer', where the build sysroot is -'/build/volteer', the file includes this line - INTERFACE_LINK_LIBRARIES "/build/volteer/usr/lib64/librt.so" -when it should instead say - INTERFACE_LINK_LIBRARIES "rt" - -The CMake documentation agrees [1]: - Note that it is not advisable to populate the - INTERFACE_LINK_LIBRARIES of a target with absolute paths to - dependencies. That would hard-code into installed packages the - library file paths for dependencies as found on the machine the - package was made on. - -[1] https://cmake.org/cmake/help/latest/prop_tgt/INTERFACE_LINK_LIBRARIES.html ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -407,7 +407,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - find_library(LIBRT rt) - if(LIBRT) - foreach(target ${SPIRV_TOOLS_TARGETS}) -- target_link_libraries(${target} ${LIBRT}) -+ target_link_libraries(${target} rt) - endforeach() - endif() - endif() - diff --git a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild deleted file mode 100644 index 246a6fc6ad67..000000000000 --- a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=SPIRV-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml(+)" -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - inherit git-r3 -else - EGIT_COMMIT="sdk-${PV}.0" - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} -fi - -DESCRIPTION="Provides an API and commands for processing SPIR-V modules" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" - -LICENSE="Apache-2.0" -SLOT="0" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" -COMMON_DEPEND="~dev-util/spirv-headers-${PV}" -DEPEND="${COMMON_DEPEND}" -RDEPEND="" -BDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-cmake-librt.patch -) - -multilib_src_configure() { - local mycmakeargs=( - "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/" - "-DSPIRV_WERROR=OFF" - "-DSPIRV_TOOLS_BUILD_STATIC=OFF" - "-DBUILD_SHARED_LIBS=ON" - ) - - cmake_src_configure -} diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest index 8d6c0ebdab8f..697fa26e5eac 100644 --- a/dev-util/vulkan-headers/Manifest +++ b/dev-util/vulkan-headers/Manifest @@ -1,6 +1,4 @@ -DIST vulkan-headers-1.3.211.tar.gz 1469275 BLAKE2B 4b9f5df8a07188b89c2be09e1d71279af1e1513f072d04e0da944b7697759e5c747bf40b78330edbf3ea71287921a9cc0fd9247d188ba9a761feb2bf04d0627f SHA512 35f849b0c493e6e1ecfeb91089085f3a567cce76466f8cc17acadfa2a2b3163420489c11fc5b547de52aed1575f28fc23c1a62ce6d321ccba3dd04fbf7e50ca3 DIST vulkan-headers-1.3.216.tar.gz 1489322 BLAKE2B a6bdc5d0517405b121861f18c330dc9db28df9c7d48994c6131e047ff640f6dd858cd3fa6efe70d8feb910d3b51c4a7d5676c8d87eefbddbedc30ff3b6af6ace SHA512 cabce62c3e681c2f89f808a0838300f859d1ea046f0036f44c5191f5a9ebbc15058507cd5d07519c34b81ba602058a137f27142c58d4e6c84b2ad382431d675a -EBUILD vulkan-headers-1.3.211.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e -EBUILD vulkan-headers-1.3.216.ebuild 630 BLAKE2B e34ad65e408499157cc82528f4cbee97251227ea37a917f84e7d4f8c12d96a2d32120e1c807c6cc23165cbabf95071ca00dd51212a958133944f18af8b1ad1a3 SHA512 401f3126876b7f65b5caadf2b4a4bc85cae645b6fd275cb1cf210b03ecb512e3d0dac07525a1903666ca931c502cc7b8cec4e6f4bedc6f5d001b3b7aa6bd8d21 +EBUILD vulkan-headers-1.3.216.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e EBUILD vulkan-headers-9999.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4 diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild deleted file mode 100644 index 767fada760a0..000000000000 --- a/dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=Vulkan-Headers -inherit cmake - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - 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 Header files and API registry" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=">=dev-util/cmake-3.10.2" diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild index ccecb4634168..767fada760a0 100644 --- a/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 7106a439dd0b..4a49f16cac88 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,6 +1,4 @@ -DIST vulkan-tools-1.3.211.tar.gz 864436 BLAKE2B 09dcb3ce388962cff0e75837d07e58572ac1cbdabdc26edf7f6bd1740278f7ea871e0e14c4ac6a203fa13033616240d7338dfb1a52c4e2ed045ed28585bc62cf SHA512 36be2970dd42e12bf6f6644bc1b14f102af36f1297c33fadddca470b65d7d324532b20c071d2f0dd790d556cd99012a4fb80f185db6165ed3f09d1fd7e5c50e7 DIST vulkan-tools-1.3.216.tar.gz 866091 BLAKE2B 750b7d26de64844162f13bb5f2c82b134c0996e2bf23883b381fc05bb8eb26c19ef3a8dc4da63543096473845952115a8e3213ee3972baa9b01104adaa09ed82 SHA512 57d152072ecad744256397e357d756f82457929a026a29127a079ea7b3b805b99ece1e0eddfecb215882a8de18cf9ab3c32c4c90126e261bc582ad05ae6173e2 -EBUILD vulkan-tools-1.3.211.ebuild 1967 BLAKE2B c83963d016226a8203d480778ddb1537c67b323c78eb84e8f0d7b2c7dedde226276cb52e25e53b7a37d592e33e2fc00310098c45faafb668636b20911fcdcfc3 SHA512 39995f27287af4bd9ab1d9fa937b1b1806e19c8fecd39085a2daac69570abe53d1dd3be04949ab1a65aa935a44f89455785fac6860d6aefc2df3df65bfefbc84 -EBUILD vulkan-tools-1.3.216.ebuild 1968 BLAKE2B 35cf99a041b2d723ff7eb350fe172433c58ba071ffbc222b45a61237c2be6a1ecc4b6cc87769e433ecdda23e90b1948dee95f22d895d6f777164e4089f30bd6e SHA512 ba43e42dabffddcc68bcd0fab1881d489df422d8721f1f16b5d9ab233a5c73884e321c530cfed7b0e501ed2c1170ddd30802fa5a80a8d0cdf2fcc98543a80982 +EBUILD vulkan-tools-1.3.216.ebuild 1967 BLAKE2B c83963d016226a8203d480778ddb1537c67b323c78eb84e8f0d7b2c7dedde226276cb52e25e53b7a37d592e33e2fc00310098c45faafb668636b20911fcdcfc3 SHA512 39995f27287af4bd9ab1d9fa937b1b1806e19c8fecd39085a2daac69570abe53d1dd3be04949ab1a65aa935a44f89455785fac6860d6aefc2df3df65bfefbc84 EBUILD vulkan-tools-9999.ebuild 1972 BLAKE2B ad0e8e81aabb0eb7448900a4170297d011b9a98d84ad88ae52555ff2a600aa59847a05e7a0667ca4fcf66530a4566b56bd2bf50fb98ac4bf8db524fe33fa7387 SHA512 5ce02baf8a542ae41256f61af68dac98c6a745032956ff14d080c8f41295700ffe0a9abf3729edfe21bf47015cc255343055a4e43701648cba229c0f11f3d696 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild deleted file mode 100644 index 2ac82693de65..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=Vulkan-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{8..10} ) -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" - S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 -fi - -DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cube wayland +X" - -# Cube demo only supports one window system at a time -REQUIRED_USE="cube? ( ^^ ( X wayland ) )" - -BDEPEND="${PYTHON_DEPS} - >=dev-util/cmake-3.10.2 - cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - ~dev-util/vulkan-headers-${PV} -" - -pkg_setup() { - MULTILIB_CHOST_TOOLS=( - /usr/bin/vulkaninfo - ) - - use cube && MULTILIB_CHOST_TOOLS+=( - /usr/bin/vkcube - /usr/bin/vkcubepp - ) - - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_VULKANINFO=ON - -DBUILD_CUBE=$(usex cube) - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" - ) - - use cube && mycmakeargs+=( - -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr" - -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) - ) - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install -} diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild index aaf0dbd98a9b..2ac82693de65 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi -- cgit v1.2.3