From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- media-libs/vulkan-layers/Manifest | 4 +- .../vulkan-layers/vulkan-layers-1.1.125-r1.ebuild | 48 ++++++++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 12 +++--- 3 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild (limited to 'media-libs/vulkan-layers') diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index ca612b056441..657b063c9219 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,4 +1,6 @@ DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027 +DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0 EBUILD vulkan-layers-1.1.106.ebuild 1408 BLAKE2B deba604fcd8171d7ea1b27f496bab561659073d3405e655561570ff11d74a92b091a8eb78b19eb8335b5a32cb2466f609b0750c873ed981afac71245aa866a82 SHA512 ffb87f7a8a1843b60b28218ad413d51e9673a5d659ce9e6eb5c1b197d7a395b991561d109ba62413b9188b902e61503080095c0251b749289d02aaece92abd7e -EBUILD vulkan-layers-9999.ebuild 1410 BLAKE2B 79c5abc89ee6e21e80d89ddc58d1bba03f233a381802b06096dea9997f4eaa262e1545da91c696e840409f1ae2cefc106a1cf7994e6905e9e64e785d541be573 SHA512 b44ee188f0bb8af2bb61ad4adabda57e8bd45396346f809d750cb801b1158989a958932bf2e6e8433ddc854d7541d6596767a8fffc3533d77246ae85205c6835 +EBUILD vulkan-layers-1.1.125-r1.ebuild 1424 BLAKE2B c3e78366c44853e84d6347a5f5d89b8e28eecbcbeb0d34caf1776e21a0577d1ab0c7c5126240de22915d3ca60cba5d607d5835078bfbe324af7979f1e1e79a2f SHA512 9148b3e286138839528ef63a13b29c5390a0c614065686e074698d70c138dd80400947b2c92a3368655e659417598afdd990aaa09b0757accc84786cfcab34a3 +EBUILD vulkan-layers-9999.ebuild 1406 BLAKE2B 6027b825492aca21c1262e040b0ea520816cb2de2dcaabb178c6dab2f8d73086e9838ae5d8a1e11618144588b1d5ad0c9ecf17c19ccaa9d9a62c572a9fc667a0 SHA512 9cf301d1901756c4d2c4e97978e87cc4a02df2fe23d464fb08b266596e72bb6f2c43ac0b59d5ff8471b7bc1ba54c7216616950384e0390e646460d97ab3d0224 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild new file mode 100644 index 000000000000..9814252061d4 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f" + 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.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}] + ~dev-util/spirv-tools-2019.10_pre20191027:=[${MULTILIB_USEDEP}] + >=dev-util/vulkan-headers-1.1.125 + 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-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 0858c0d8f899..787e1d87acf1 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git" EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746" + EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f" 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}" @@ -25,9 +25,9 @@ SLOT="0" IUSE="X wayland" DEPEND="${PYTHON_DEPS} - >=dev-util/glslang-7.11.3114_pre20190415:=[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}] - >=dev-util/vulkan-headers-1.1.106 + >=dev-util/glslang-7.12.3353_pre20191027:=[${MULTILIB_USEDEP}] + ~dev-util/spirv-tools-9999:=[${MULTILIB_USEDEP}] + >=dev-util/vulkan-headers-1.1.125 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] -- cgit v1.2.3