From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- media-libs/vulkan-layers/Manifest | 8 ++-- .../vulkan-layers/vulkan-layers-1.1.77.0.ebuild | 56 ---------------------- .../vulkan-layers/vulkan-layers-1.1.82.0.ebuild | 2 - .../vulkan-layers/vulkan-layers-1.1.92.0.ebuild | 48 +++++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 7 +-- 5 files changed, 54 insertions(+), 67 deletions(-) delete mode 100644 media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild create mode 100644 media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild (limited to 'media-libs/vulkan-layers') diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 24d422040f2e..d68608776a88 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,8 +1,8 @@ AUX vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch 2441 BLAKE2B 445a3c6a453c9f08b8b58ac7ccb55fbbb61a942372dc2eebea7cb6552fe071334fd940ecf3e222a2319662b74c11e001ee0d1460720659cd2fdc00cfa9d269c5 SHA512 7582d2e7e3a65598f9a4b559d3c647f0824575c00f3415b1e54a8d3211cf6087f0cb7b95c2c4034888321ff12342817668c09eb0b5b91d2327c1f34cc37eccae AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b -DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411 DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a -EBUILD vulkan-layers-1.1.77.0.ebuild 1660 BLAKE2B 866aab2a228bc43e226f1b48ce8ddb9e7149c334cd03ed124f8cabab619aec2b04771e07995855451b3d84cafed3175ae84dcc5aff59d75b3de992ea384ddc9b SHA512 ac65f13a924f4a75c4fa6730e59c9a35c2fb48eeb329cdbb109c973df4c4aa388ac5afb135bfaad9e095bac678780c5550ce46d645d88b1e81fdae44d5846b1f -EBUILD vulkan-layers-1.1.82.0.ebuild 1594 BLAKE2B 20b69a4cd5356a92655fc050ec427a0f7dc7ffd0a0197f6c6892cd65f62f6e27ab526caee3d2a02c303e15464b81c8279a9aec9a45281f551f8fc0c2cdde9614 SHA512 8bfa1cf9257ef9db85dcf5b92f4636004bc6818bc7335fadba84d6f88455fce7bea176b5ab12d8ce0b1061442a3d8e9e557e79b96cff9e7fe85c76d5a412bdb5 -EBUILD vulkan-layers-9999.ebuild 1508 BLAKE2B 47de5940e633ed9920593da59c887cb8a5839c01f2e968053209d0ab1d46ef42971749860423ea1aa5856c095d51ab4ecbaf2b22ce45caf51fc0441b70c7e134 SHA512 06cc8debd5e1dfac433e2d18641e3a48288a8cb05d25acdb0814d71ff1adf3edfea95a9a5321b8cd7ea673a5912a0ebeba8743ef53c28af405a27803d099c5b2 +DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6 +EBUILD vulkan-layers-1.1.82.0.ebuild 1499 BLAKE2B 2f2b35c2ea64ea2ed34ab92a191cccf4892d8d5716d9420d09f3a23649d6d2a5007d1fb259abe059512dde226daf76b759c6bf62bd45d408b8d2211d5f38605b SHA512 6425c3c3b6f1caa8acc61b60c2252a9b2860d965e7938321919aed8298146063aedc7ae63acf0c51598948b0fed0d512e83dfa306d79e0f0031a03dd04e6abdb +EBUILD vulkan-layers-1.1.92.0.ebuild 1382 BLAKE2B 612d1b274013fda74869ad7f3889bb68510fb8e837f0d1be37a03d66de56e6ad3a93ba299addda562e493e0c4cc381bf2542174cdb69a536ad033be3c63373eb SHA512 3d0e10fb745567b45542e7970cf0d6964a4e34e642ab9f370a37069203bfb0d73a67c994bb0a4595c4f8f220d912ba90ba2e9bba9007d53fe4fc347fa0da5f59 +EBUILD vulkan-layers-9999.ebuild 1382 BLAKE2B 4085c6efe3f7fef3c784ed51818914adf7851a4d0c2b2c1e6b83cb0ce744e1fd89548533141f38d006f5ca455722cd7f2ac588fbfec8f97b7c78902f8457322f SHA512 5721d495b9d79c3aa846fe274fa76122e59c3aa415f8d2544a6570716014ade2bbc940b7a7117d5e10841330b0b5094e512ef12480cb2876fa4903303bbc5a6f MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2 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 deleted file mode 100644 index cbe189ea63ce..000000000000 --- a/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild +++ /dev/null @@ -1,56 +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="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-1.1.77.0-r1 - 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" - "${FILESDIR}/${PN}-1.1.77.0-layers-Rework-include-dependencies.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-1.1.82.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild index 3f6a62d453d7..da4914c98bf2 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild @@ -24,8 +24,6 @@ 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-7.9.2888:=[${MULTILIB_USEDEP}] >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild new file mode 100644 index 000000000000..4d66e6776c6f --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Authors +# 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="6e6da6ccab8931f7c30815966ef839b1155e5bec" + 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" + +DEPEND="${PYTHON_DEPS} + >=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + >=dev-util/vulkan-headers-1.1.92.0 + 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" + -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 3ea3133c0413..a01cafe630db 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -24,12 +24,10 @@ 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-7.9.2888:=[${MULTILIB_USEDEP}] + >=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}] >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] - >=dev-util/vulkan-headers-1.1.82.0 + >=dev-util/vulkan-headers-1.1.92.0 wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] @@ -39,7 +37,6 @@ DEPEND="${PYTHON_DEPS} 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) -- cgit v1.2.3