From 6c9dc10e04cd513437e046ccca0e51a3d6d4dc7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 May 2024 00:01:35 +0100 Subject: gentoo auto-resync : 17:05:2024 - 00:01:35 --- media-libs/vulkan-layers/Manifest | 9 ++-- .../vulkan-layers-1.3.250-Build-shared-libs.patch | 13 ----- .../vulkan-layers/vulkan-layers-1.3.275.ebuild | 60 ---------------------- .../vulkan-layers/vulkan-layers-1.3.280.0.ebuild | 2 +- .../vulkan-layers/vulkan-layers-1.3.283.0.ebuild | 60 ++++++++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 4 +- 6 files changed, 67 insertions(+), 81 deletions(-) delete mode 100644 media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch delete mode 100644 media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild create mode 100644 media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild (limited to 'media-libs/vulkan-layers') diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index f5bdf31423fc..856aa2f79c20 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,7 +1,6 @@ -AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413 -DIST vulkan-layers-1.3.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70 DIST vulkan-layers-1.3.280.0.tar.gz 5465068 BLAKE2B c0b568b59cb8a17bea7dd1c1522c0a72279ad6a07f2f11383bc069f141fbb179529dd4ccd34b2a7a9a9a4af0e173ebbc49541a42c2b32ea8b54d90302f7ee449 SHA512 b397d4aa5406e25eb241a72f006fb05554d8ec96eec4c31ed08ef34d0b362f8e544a2e8bcf044112bdbb2733f2a9f50bf8b63aff64e143e450fa01298dc7838a -EBUILD vulkan-layers-1.3.275.ebuild 1644 BLAKE2B 5d03caef5de18f10040bbe5fcfa23526c51684ef95fd9953efdfaa1b217cf11d5e6561ffeb14390c62ab32ea6bd38fcd002120b3a4b0fed80d386ffde9d9f08b SHA512 bd2e9eced89d8161eca83c07d27342abb68e147d60094285437c83aeb9089ff30eef038ff8d70679f24a71eb18f772532df5d91b1223306a02107e9c75dee537 -EBUILD vulkan-layers-1.3.280.0.ebuild 1642 BLAKE2B 4517006574e08e8cde690412194b53e460b9992225c2be8567f5cc928b9f7a1293f819844ca19af7c75dc8bddab52a1f01c55ebaed7406f238fb3462564638a1 SHA512 9c03531659613e889b4985a3485d2244f32c7af853c70bf8d3acf592409edb0823d9df01455735f0700b6acd5024d76210487a1d924083cc674a565489226a67 -EBUILD vulkan-layers-9999.ebuild 1646 BLAKE2B 624c9d714e188a4865ac48e7ef1408bfd60e9d079d2036f3ae782daa6f0209218bb341d479873f481d4a270c26042b1c68152a2eafacfb8bc7a69a611ba4c8ac SHA512 0c80de23d7d1d5fbd9636f4d860c845d8874fac759edf3875a0a1022866759a8ec8362b1b20408fd5b1b5363cd67e820d311b0459f347c6cdfbfaf6392aaf4a1 +DIST vulkan-layers-1.3.283.0.tar.gz 5230566 BLAKE2B c16a4af62900a4b053f7dd60da5279bc088cd297f22bc247be2718cc3187136b60e90530298c068fdd384c9135e83f91f3ffd7b3db9f12555d6dd88b6e9b66ef SHA512 fc2ca2c79be8e01fc39a7802644d5e10b5196317eaac246a17b73093409739e771ac267c1ed8aad08ba68afdebc583702980f195a5f93421a0c041da3f4b6e49 +EBUILD vulkan-layers-1.3.280.0.ebuild 1640 BLAKE2B 49009411de0d6c2be662406cdd1bc527ac1706f0650439ce12f6b8e52172d5bf409a1f0a90338f9a469200b4b0a69e37d59662a746984aa4af383e72b67f5f10 SHA512 cf6779d49fb87776dfc772b0ac8e74c4e0c753c3a9544beb808622fafc39e851c083d2936aaedea0e821c2a0fed9315eecea9f8b951b3308a59fd699d0891167 +EBUILD vulkan-layers-1.3.283.0.ebuild 1644 BLAKE2B a3052e0b2c2822c79c9a8459e947840e3ae5d203c2a9ff903e737b1ce446610a078475ab5a67b6c21fea8b5c4e861ae6f80139f6ed2bce2d6e7d57e858b36b74 SHA512 943561dfc9ece07319fa56ca3b44745aa9e1102487a68207dbadb6a0a9b13ec485298fd9f16bbae454e6660da97ed3769772d9cd321e3ab0ec1ca468e37d23b0 +EBUILD vulkan-layers-9999.ebuild 1644 BLAKE2B a3052e0b2c2822c79c9a8459e947840e3ae5d203c2a9ff903e737b1ce446610a078475ab5a67b6c21fea8b5c4e861ae6f80139f6ed2bce2d6e7d57e858b36b74 SHA512 943561dfc9ece07319fa56ca3b44745aa9e1102487a68207dbadb6a0a9b13ec485298fd9f16bbae454e6660da97ed3769772d9cd321e3ab0ec1ca468e37d23b0 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch deleted file mode 100644 index 0a5e242a542a..000000000000 --- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 06b53ff9b..97e388765 100644 ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -166,7 +166,7 @@ if (VVL_CODEGEN) - ) - endif() - --add_library(vvl MODULE) -+add_library(vvl SHARED) - - target_sources(vvl PRIVATE - best_practices/best_practices_error_enums.h diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild deleted file mode 100644 index c9810ee2b3ef..000000000000 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=Vulkan-ValidationLayers -PYTHON_COMPAT=( python3_{9..12} ) -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/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0 -fi - -DESCRIPTION="Vulkan Validation Layers" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -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/spirv-headers-${PV} - ~dev-util/vulkan-headers-${PV} - ~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}] - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" - -PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" - -DCMAKE_SKIP_RPATH=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 - ) - cmake_src_configure -} - -multilib_src_install_all() { - find "${ED}" -type f -name \*.a -delete || die -} diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild index 5c106026e5ef..ca10d7658eb2 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.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}-vulkan-sdk-${PV} fi diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild new file mode 100644 index 000000000000..81a4ba180a76 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-ValidationLayers +PYTHON_COMPAT=( python3_{10..13} ) +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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} +fi + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="wayland X" + +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/spirv-headers-${PV} + ~dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" + +QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so" + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" + -DCMAKE_SKIP_RPATH=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 + ) + cmake_src_configure +} + +multilib_src_install_all() { + find "${ED}" -type f -name \*.a -delete || die +} diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 8e97234b84e0..81a4ba180a76 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 MY_PN=Vulkan-ValidationLayers -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -24,7 +24,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="wayland X" -RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]" +RDEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} ${PYTHON_DEPS} >=dev-cpp/robin-hood-hashing-3.11.5 -- cgit v1.2.3