diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
tree | 3cb05783d73b2c33589ba305144a31c718e123cd /dev-util/vulkan-tools | |
parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) |
gentoo resync : 03.03.2019
Diffstat (limited to 'dev-util/vulkan-tools')
-rw-r--r-- | dev-util/vulkan-tools/Manifest | 6 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild | 92 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild | 2 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 4 |
4 files changed, 97 insertions, 7 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 8f51ef57f841..f457c3f2c283 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,6 +1,8 @@ +DIST vulkan-tools-1.1.101.tar.gz 351619 BLAKE2B d00a8adc687c6ac513748fd706b7167dd6e929f37ed2315b8c5e7f302976625848e9ad383261e8948adfc6926247676ccec2b6c8143d23343c4022f3a20795db SHA512 e4f5c3236eded7c17f381a9d6cdd20930444c486d0c8c3aaf67f5a46b3787643517e29d3d5d7305e72a60450b0e73daed996a9336a4166ab5241585e85190387 DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5 DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc +EBUILD vulkan-tools-1.1.101.ebuild 2200 BLAKE2B 0e9bb2e475a3dda73b3e2f196ee9575accfa54bf483e43a854f9083723fb32b7ace0cc1ca97cff4d3cd30274cdf67cc13ae5990e83e635af0e5263b3e62b004a SHA512 fb5cd9bdd0162d674f141f1ff5f01ea5888e5e03b4f03ded62f78a4f47a26b567a7365f75d0ec3c63e337d9e1447541632660e06816ced904b8b5c82dfb8e059 EBUILD vulkan-tools-1.1.82.0.ebuild 2570 BLAKE2B 5e4807b5921e8883b183b97f9e0ee093d75fa5b71e4039e608823276db6440cd9e6f2168532762a513115ce6768847f04a3f5a544a0fb0ea88f519a554002d06 SHA512 0dcad5bd9b43b807c1e2622a003cb17de07ac46d0df1fa4510efdddd662e05894d7d379f21ae0aaafc6128f0629e859f2b8c911020371699dea2948e63e1a286 -EBUILD vulkan-tools-1.1.92.0.ebuild 2267 BLAKE2B b147cedd8c564ca9572b531743d28d00c630966c9d10ad09e4004a0b718af4259421b0d436152925862353ffb0d6e0f097400cfa3313f95e63242867e809c036 SHA512 7d8ef8cbb05901fd4ec95d884d98bb404d2e4b16208bc51d03d69759bb1e350689eedd21d4e599638a33e5e80c7866cb2d2324cbb06e895c3cb29dda6159e596 -EBUILD vulkan-tools-9999.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d +EBUILD vulkan-tools-1.1.92.0.ebuild 2199 BLAKE2B 0ab17921ca1bdce82e1e506514e1bd0c9cebc9248cc5d1d7fe13b2f6b33c0af94d801d66f2c872e0e6f2678f618e9ff990db3f634971023aa77a2c25d9d05219 SHA512 535d82546f589843880b741df3844ec5b88e25690d8da110379a46d3c79cf74ada8ffdfe7becf86ab465514cbbb0170d533c17cbf5335a5844631b1a4bf63db3 +EBUILD vulkan-tools-9999.ebuild 2200 BLAKE2B d924055938b632919d81de174f0d2ff5afe1fc5af9a357392d4e626efadd01b2e6a900839416d4e6f7566189ec0c7d7e4df23fbdbd73c4ed6c98873ec1dc45f5 SHA512 e0216a51be8082952aa2abcd492fa9144930f2a4c6ac56dcaf737a9ec977df521e736e9965b9ebadb383b169ff4406e576cce380c32a39f485542dc6327ac4e4 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild new file mode 100644 index 000000000000..7c544ec45b97 --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2019 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-Tools.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="35464647e75e0385973664d8443a6c000f1c292d" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+cube +vulkaninfo X wayland" + +DEPEND="${PYTHON_DEPS} + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) + dev-util/vulkan-headers + media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +# Vulkaninfo does not support wayland +REQUIRED_USE="|| ( X wayland ) + vulkaninfo? ( X )" + +pkg_setup() { + MULTILIB_CHOST_TOOLS=() + + if use vulkaninfo; then + MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo ) + fi + + if use cube; then + MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube + /usr/bin/vkcubepp + ) + fi + + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=True + -DBUILD_CUBE=$(usex cube) + -DBUILD_VULKANINFO=$(usex vulkaninfo) + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DGLSLANG_INSTALL_DIR="/usr" + -DVULKAN_HEADERS_INSTALL_DIR="/usr" + ) + + # Upstream only supports one window system at a time + # If X is set at all, even if wayland is set, use X + # + # If -cube and/or -vulkaninfo is set, the flags we set + # are ignored, so we don't need to consider that + if use X; then + mycmakeargs+=( + -DCUBE_WSI_SELECTION="XCB" + ) + fi + + if ! use X && use wayland; then + mycmakeargs+=( + -DCUBE_WSI_SELECTION="WAYLAND" + ) + fi + + cmake-utils_src_configure +} + +multilib_src_install() { + cmake-utils_src_install +} diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild index a23ba1cb8bfa..f780cede7c81 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild @@ -60,7 +60,6 @@ multilib_src_configure() { -DCMAKE_SKIP_RPATH=True -DBUILD_CUBE=$(usex cube) -DBUILD_VULKANINFO=$(usex vulkaninfo) - -DBUILD_WSI_MIR_SUPPORT=False -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) @@ -76,7 +75,6 @@ multilib_src_configure() { if use X; then mycmakeargs+=( -DCUBE_WSI_SELECTION="XCB" - -DVULKANINFO_WSI_SELECTION="XCB" ) fi diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index d3d1c9c446ff..e7562a4d6835 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -60,7 +60,6 @@ multilib_src_configure() { -DCMAKE_SKIP_RPATH=True -DBUILD_CUBE=$(usex cube) -DBUILD_VULKANINFO=$(usex vulkaninfo) - -DBUILD_WSI_MIR_SUPPORT=False -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) @@ -76,7 +75,6 @@ multilib_src_configure() { if use X; then mycmakeargs+=( -DCUBE_WSI_SELECTION="XCB" - -DVULKANINFO_WSI_SELECTION="XCB" ) fi |