diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-12 09:56:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-12 09:56:54 +0000 |
commit | ebc282ef4dfa408accac685565b8ee5f6faec119 (patch) | |
tree | c0a4f713228cda0ab17eed46f0bb7ca8cb8be2f6 /media-libs/vulkan-layers | |
parent | 6c8694a707151d59555b0e4e48235f085ce166c3 (diff) |
gentoo auto-resync : 12:02:2023 - 09:56:54
Diffstat (limited to 'media-libs/vulkan-layers')
4 files changed, 0 insertions, 183 deletions
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index a2684b4687b5..8beef4ffca39 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,11 +1,7 @@ -AUX vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch 879 BLAKE2B c9468c7ebada19d1a252b6dc6f8dcc6edd2f5497e86cba815a4da900ad933f619ea8589071d86a387810b07d3cb58fcabcb4a86c15742e539f7333d55679abc3 SHA512 c8f86399a58cd2454c11e2e240def31b4dade136d1546da0b23c77d89de767dc9c126ac3e77a585cd56d82f5557a0316e439f1f724f4ab8e615d28520e66497a -AUX vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch 5089 BLAKE2B e76b6fdedf175c246e227e1317243ceb1842b19ad7f64cc0d7ffa4935f554dbdf5664ee8907b47ac22e7308110ea0faced11aa40f3870f059a9679b4ef1db6f1 SHA512 28cad48b59458e21e8a46d3e7ea915a8d7358962e2c0a7f99db1db99ed9d6090a129be874cce7fc528991476ccc41acccc1f1627b449dfdb8555ce8173dbb179 AUX vulkan-layers-1.3.236-Build-shared-libs.patch 770 BLAKE2B 2d1993ac077cab2b7de5509bf82ae57ec8783e0a9759718fb38884740eb609cfa5f8509bf45f4bc9a81d92cf8f377c3455cc293fe3c0ba75d3388028e041a598 SHA512 e59d13680f53b51755954f68c7389d873e205aafe16ae6ca11a2c3137cce39ecfecf37be1aa66fb6e5bd122dfaafc6eea507bc958dd68e569274576fbdd83999 AUX vulkan-layers-1.3.239-Build-shared-libs.patch 754 BLAKE2B fb86f678b9b2b76642ec3fccdd3068b9f4da2dd55f884fe4adb83b02090adb1c992a2aca853cf7b716a0006f8ff2cb2660070220b54c450f5333d5436c4b93a4 SHA512 d82a8b4ddb542b52a49c6fc83aac5af5b598371df58699838f5c646efcbd10b0ba54dd163e3c223b54f276f2209f942d65d7d32aef42d395a154cfb7aadd5b33 -DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606 DIST vulkan-layers-1.3.236.tar.gz 4519779 BLAKE2B 087ecbfc4e460dbdd65009262d3ddedbed72258742ec902ac6e6e89d779aa350f819d4aa2aad4a30d365bdfb079c25ccaec265b9c5b56066e082db4701300095 SHA512 0ebb9d44b1a465a28702e12c80c6accb55dbd6a53ce2f1eb8e8cd627583a217544e21e8eb7e1619620458d756c0cde244bcde331710ab8244e113e302839f479 DIST vulkan-layers-1.3.239.tar.gz 4549587 BLAKE2B b5ac5afade60b048414a336dc130ae2e7c332e1a9e4b86448be9c86f17f7705990b27908721ee2f62e3425f117d3941f47525f8fa0d07e79bc3c68f7e4e48f14 SHA512 4b96951874e5b7c7abbab83b0b85cfe10b13d3ced20148ddcdd9b6e79db5d083b9ee00ae1c3605a72bcea4c3b8f1ab42ed284eb2cbc8f7e98d377108970e884c -EBUILD vulkan-layers-1.3.231.ebuild 1658 BLAKE2B 69de925ac6a97e3121e5794510067950e5bac89ac7f1553a17b9ae614cfdcbcdaf914ff26e2ee3ec01e0b37344a040eeb521629dc0b8a8ac40fff45144f9c4e0 SHA512 c7afc37901c2f8d3a04914b0fb4e5678a16e3c670f0dd13ee4034e16f86df1dbd8be67d58552b6e89c81582f1e224b577555fc278862e044543526904c3dfe00 EBUILD vulkan-layers-1.3.236-r1.ebuild 1576 BLAKE2B 11392cfe2d07d313b2a64828240371fecbb990793fc46c59c795d6158e81ba57b8029c46de31f826b2653febeb08bcfdf28a4e290f6e2dc84e72d549adb1e05d SHA512 01040d2fcd1b4dc563b55b48f7c89bfae8ef551b342fd1e79636913511f2368101ff2768c0f65d6886eff1b43589d72d5b14db875a0531e8e87b7b8b57e826f8 EBUILD vulkan-layers-1.3.239.ebuild 1519 BLAKE2B 9bf8185dacc558e32052f66eb61d1dd44d841e2ed7d4a675b6f2fcc69476d41f02e9c9080e9f897f16be2277e9bcc1551a380583cd0bef91a6a75b110940778d SHA512 d80ec769c69a1547cec209de3906af8cc5a972ec6fa645abe5ddaa3972bf34cf372772748bfe726369ecf9c043e695aac89299038b88b4f34ea34c0a274b2f40 EBUILD vulkan-layers-9999.ebuild 1531 BLAKE2B 06dd7ec385306430b26698ed1645478fdaa6ebb95d1f18341ba85f48a24ad2c1d284b64d9122f9bc0dcb77491585477333d612688f2ae15d504f2d70b23379e9 SHA512 fef7e56dd11a24290748041898259cca92a6c25dcb9930a7283e2d2c70346c6fc7bc2091239271cbe1cbe22299ef03e86f2ef8433efd3673210248bc023abf9d 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 deleted file mode 100644 index 4bd9abf89a87..000000000000 --- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch deleted file mode 100644 index bd17c69315e0..000000000000 --- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 836a09267fe034ce783570e6920e1b638c0bd212 Mon Sep 17 00:00:00 2001 -From: Juan Ramos <juan@lunarg.com> -Date: Fri, 21 Oct 2022 17:43:23 -0600 -Subject: [PATCH] cmake: Cleanup find_package SPIRV code - -- Use get_target_property instead of relying on passed in var -- Remove unused var -- Cleanup find_package(SPIRV-* code ---- - CMakeLists.txt | 55 +++++++++---------------------- - cmake/VVLGenerateSourceCode.cmake | 5 ++- - 2 files changed, 19 insertions(+), 41 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7f01081415..23de46a1a22 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -204,52 +204,27 @@ if (USE_ROBIN_HOOD_HASHING) - endif() - - if(BUILD_LAYERS OR BUILD_TESTS) -- find_package(SPIRV-Headers CONFIG QUIET) -- if(SPIRV-Headers_FOUND) -- # Prefer 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() -+ find_package(SPIRV-Headers REQUIRED CONFIG QUIET) - -- # VVLGenerateSourceCode depends on spirv/unified1 - include(VVLGenerateSourceCode) - -- if (NOT TARGET SPIRV-Tools-opt) -- find_package(SPIRV-Tools-opt REQUIRED CONFIG) -- endif() -- -- if (NOT TARGET SPIRV-Tools) -- find_package(SPIRV-Tools REQUIRED CONFIG) -- # See https://github.com/KhronosGroup/SPIRV-Tools/issues/3909 for background on this. -- # The targets available from SPIRV-Tools change depending on how SPIRV_TOOLS_BUILD_STATIC is set. -- # Try to handle all possible combinations so that we work with externally built packages. -- if (TARGET SPIRV-Tools) -- set(SPIRV_TOOLS_TARGET "SPIRV-Tools") -- elseif(TARGET SPIRV-Tools-static) -- set(SPIRV_TOOLS_TARGET "SPIRV-Tools-static") -- elseif(TARGET SPIRV-Tools-shared) -- set(SPIRV_TOOLS_TARGET "SPIRV-Tools-shared") -- else() -- message(FATAL_ERROR "Cannot determine SPIRV-Tools target name") -- endif() -+ find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET) -+ -+ find_package(SPIRV-Tools REQUIRED CONFIG QUIET) -+ # See https://github.com/KhronosGroup/SPIRV-Tools/issues/3909 for background on this. -+ # The targets available from SPIRV-Tools change depending on how SPIRV_TOOLS_BUILD_STATIC is set. -+ # Try to handle all possible combinations so that we work with externally built packages. -+ if (TARGET SPIRV-Tools) -+ set(SPIRV_TOOLS_TARGET "SPIRV-Tools") -+ elseif(TARGET SPIRV-Tools-static) -+ set(SPIRV_TOOLS_TARGET "SPIRV-Tools-static") -+ elseif(TARGET SPIRV-Tools-shared) -+ set(SPIRV_TOOLS_TARGET "SPIRV-Tools-shared") -+ else() -+ message(FATAL_ERROR "Cannot determine SPIRV-Tools target name") - endif() - endif() - --# Generate dependent helper files ------------------------------------------------------------------------------------------------ -- --set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts") -- - # VkLayer_utils library ---------------------------------------------------------------------------------------------------------- - # For Windows, we use a static lib because the Windows loader has a fairly restrictive loader search path that can't be easily - # modified to point it to the same directory that contains the layers. TODO: This should not be a library -- in future, include -diff --git a/cmake/VVLGenerateSourceCode.cmake b/cmake/VVLGenerateSourceCode.cmake -index 43efdb8201c..13c81e38aca 100644 ---- a/cmake/VVLGenerateSourceCode.cmake -+++ b/cmake/VVLGenerateSourceCode.cmake -@@ -20,7 +20,10 @@ if(PYTHONINTERP_FOUND) - message(FATAL_ERROR "Unable to find vk.xml") - endif() - -- set(spirv_unified_include_dir "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/") -+ # Get the include directory of the SPIRV-Headers -+ get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES) -+ -+ set(spirv_unified_include_dir "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/") - if (NOT IS_DIRECTORY ${spirv_unified_include_dir}) - message(FATAL_ERROR "Unable to find spirv/unified1") - endif() diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild deleted file mode 100644 index 8dab57540f03..000000000000 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -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}]" -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}] - ) -" - -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 - -DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry" - ) - cmake_src_configure -} |