From b2be182d49eea46686b5cf2680d457df61e89dc4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jun 2018 08:49:38 +0100 Subject: gentoo resync : 30.06.2018 --- media-libs/vulkan-layers/Manifest | 6 +-- .../vulkan-layers-0_pre20180601.ebuild | 55 ---------------------- .../vulkan-layers/vulkan-layers-1.1.77.0.ebuild | 55 ++++++++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 2 +- 4 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild create mode 100644 media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild (limited to 'media-libs/vulkan-layers') diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 22370f3a9e9a..251c8374c7b5 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,6 +1,6 @@ AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2 -DIST vulkan-layers-0_pre20180601.tar.gz 1099188 BLAKE2B 74bc6aeb789485768639482bee5d4383db80344b3bd1f25c8767769d99199fb7db8c9bb6dfc597290aac1bec742851658300e52884fc734f5f6a1e4f8d3f8194 SHA512 7212a5359e56ef593d05c9aa61fd64f13737c55757a38d5d45d71f97f59a0719bf154dfc5a62a54905a944b3fcc24c08b56226c517fc79180a6f6584bf54850b -EBUILD vulkan-layers-0_pre20180601.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d -EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B d9a5a239e0287f50a2c9fcff4fe788379d94e092261d455fa76b0588e969b34887c2b937a27b38de085645f06529c8c7570be7d5cfaad57bdd461447b924a1d3 SHA512 5f1fe4527a620fe027570c823fca1f8c89ae4a9ab8d9efbc52484a82c239e6049e602acf5968ad163211f60207ae155dcac5ec0c482572410eeba0359d34641f +DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411 +EBUILD vulkan-layers-1.1.77.0.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b +EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild b/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild deleted file mode 100644 index 2187d9d65c0d..000000000000 --- a/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git" - EGIT_SUBMODULES=() - inherit git-r3 -else - EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338" - KEYWORDS="~amd64" - 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" - -# Old packaging will cause file collisions -RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" -DEPEND="${PYTHON_DEPS} - dev-util/glslang:=[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] - dev-util/vulkan-headers - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - )" - -PATCHES=( - "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" - "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" - ) - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_WSI_MIR_SUPPORT=False - -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" - ) - cmake-utils_src_configure -} diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild new file mode 100644 index 000000000000..436c46fc5259 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8" + KEYWORDS="~amd64" + 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" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + dev-util/vulkan-headers + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + ) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_WSI_MIR_SUPPORT=False + -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" + -DVULKAN_HEADERS_INSTALL_DIR="/usr" + ) + 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 c4dcf61a753b..436c46fc5259 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338" + EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}" -- cgit v1.2.3