From 2997df5d95cb64694ec91d50c93407e92c68e2a8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Feb 2023 21:14:48 +0000 Subject: gentoo auto-resync : 04:02:2023 - 21:14:48 --- media-libs/vulkan-layers/Manifest | 7 ++- .../vulkan-layers-1.3.239-Build-shared-libs.patch | 22 +++++++++ .../vulkan-layers/vulkan-layers-1.3.236-r1.ebuild | 2 +- .../vulkan-layers/vulkan-layers-1.3.239.ebuild | 57 ++++++++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 +- 5 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch create mode 100644 media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild (limited to 'media-libs/vulkan-layers') diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index f98d4eb2020b..baf293cf3857 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,9 +1,12 @@ 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 1582 BLAKE2B 6dbeb7360f0686a80d6d5dff8760425a5c62d1f30628f7d876b9463433b645d979e7904182c25864f2104c105b0ec6bf7d7c1e51bb2f7ad8bf804ad67a15511f SHA512 8bd87fd04859b3dc0587aa94ab10f3acaed62395178879abb485a0516a6a207f5e506a2f75af00739c368a24e905cc9d56c7580a99d2788722b3bd6f72fce281 -EBUILD vulkan-layers-9999.ebuild 1594 BLAKE2B b2f8c3a13352de5a5b791f8c4bb9691c07c63871397ffa593d2ae61c2eed2988f28ce9ae50b20bbeda00fc6881704d2fed866a575bb946ca9a17b14e3be2988b SHA512 ec695c5a0c77765971370f9a79a3f98affacd381a0a75b32751914dac2a2e4abae8e5b15ca705be60a124f7d035c26799b26238cfc205ea2a433b226d1feefd4 +EBUILD vulkan-layers-1.3.236-r1.ebuild 1577 BLAKE2B b17b2fc1eebc02a4c4b19daa7433a422bc2a88ea446b05a34dc8d471b2b4d2c105448f3a4f63d472d74cffe9690e93805eb764d99fb5790fcb9a4dd6c619bbbb SHA512 fea30c5244a98a6abb42ff62ddcd025222c118230760f881b6218b4508a44aadeadfe19c1532f6aeb8b39b8ae7baeb7e9f7a0bfbc7ae5c1e8880c89a826381cd +EBUILD vulkan-layers-1.3.239.ebuild 1582 BLAKE2B 6dbeb7360f0686a80d6d5dff8760425a5c62d1f30628f7d876b9463433b645d979e7904182c25864f2104c105b0ec6bf7d7c1e51bb2f7ad8bf804ad67a15511f SHA512 8bd87fd04859b3dc0587aa94ab10f3acaed62395178879abb485a0516a6a207f5e506a2f75af00739c368a24e905cc9d56c7580a99d2788722b3bd6f72fce281 +EBUILD vulkan-layers-9999.ebuild 1594 BLAKE2B 20b37105d84f6f02ec5e4338481d5e8a9029b77afecf51fe98d680642196cd5333957ea1b1aa4008f4c8f41dc67972d6a45eb5545d382e668643ff2f4f39100c SHA512 89da24868c4494e8769b0665dd3da876ca31036b6aaecc7c0fe0659b2febd59b615f5b6e3730e7cfe538d94f144408a2ce0561f15d2bc08312f67619ede068db MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095 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 new file mode 100644 index 000000000000..f290164555a5 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-Build-shared-libs.patch @@ -0,0 +1,22 @@ +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/vulkan-layers-1.3.236-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild index d1fb64baadfb..f293d1bc1ffe 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild @@ -13,7 +13,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/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild new file mode 100644 index 000000000000..d1fb64baadfb --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild @@ -0,0 +1,57 @@ +# 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" + +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}] + ) +" + +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 + -DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry" + ) + cmake_src_configure +} diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 27cb0fa07484..edcb48708e16 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -38,7 +38,7 @@ DEPEND="${RDEPEND} ) " -PATCHES="${FILESDIR}/${PN}-1.3.236-Build-shared-libs.patch" +PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch" multilib_src_configure() { local mycmakeargs=( -- cgit v1.2.3