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 --- dev-util/vulkan-tools/Manifest | 8 +- .../vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild | 106 --------------------- dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild | 4 +- dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild | 94 ++++++++++++++++++ dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 4 +- 5 files changed, 100 insertions(+), 116 deletions(-) delete mode 100644 dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild create mode 100644 dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild (limited to 'dev-util/vulkan-tools') diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 6f569adf8a88..39f866d061f6 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,6 +1,6 @@ -DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725 DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5 -EBUILD vulkan-tools-1.1.77.0-r2.ebuild 2668 BLAKE2B d3f677d402b723cdc7ccdda4d33500656a68c1fa83b8bef6a17e8ea2ebc78bc9aaca066beb3f03b756c365a9e791ea723753bd78702b34a6cb02f2792e6f3c46 SHA512 0ad2d536ce9d84a54d52722c8a82dac94d237c0df576e8aed3e2b7910bc226084c421b054806829436c0a6b5d4b4349a112c4e49390b9293be048661483d5b93 -EBUILD vulkan-tools-1.1.82.0.ebuild 2668 BLAKE2B 92594bfe9057db8ff7c4fb1bcccaefc555b7ac4e056ffbfe52f135793b83d9629887374beb97fe59060259dfe552411198e450c782cf9b8e618406ec416ef79c SHA512 551425dfa25ff5d82364be1add58d45bd5d2aeeca43f69834aaf007205beae9755d93886ef96b5d5be55828c69cd43059792d1e04f22b851737d43a1cf4b2533 -EBUILD vulkan-tools-9999.ebuild 2363 BLAKE2B 723e6012a6634cfbb521b99f5fa7813062e4d7310e7873a8b5c95114561cafe2824f6f51f9277f8de73b8083d870bdb9514e2c238de42e8175dfccd838603c28 SHA512 9718904d1fda46a920c629f79a7642e137b4a94a3c15181bdd89175bf5d07c2415fb28f27426d1004afb020d5bf6d21b6a2330935abe09411f95487999215d35 +DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc +EBUILD vulkan-tools-1.1.82.0.ebuild 2570 BLAKE2B 5e4807b5921e8883b183b97f9e0ee093d75fa5b71e4039e608823276db6440cd9e6f2168532762a513115ce6768847f04a3f5a544a0fb0ea88f519a554002d06 SHA512 0dcad5bd9b43b807c1e2622a003cb17de07ac46d0df1fa4510efdddd662e05894d7d379f21ae0aaafc6128f0629e859f2b8c911020371699dea2948e63e1a286 +EBUILD vulkan-tools-1.1.92.0.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d +EBUILD vulkan-tools-9999.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild deleted file mode 100644 index 76c30998e49b..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild +++ /dev/null @@ -1,106 +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-Tools.git" - EGIT_SUBMODULES=() - inherit git-r3 -else - EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23" - 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" - -# Old packaging will cause file collisions -RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" -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/vulkancube - /usr/bin/vulkancubecpp - ) - 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_MIR_SUPPORT=False - -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" - -DVULKANINFO_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 - - if use cube; then - mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die - mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die - fi -} - -pkg_postinst() { - einfo "The cube and cubepp demos have been renamed to" - einfo "vulkancube and vulkancubecpp to prevent collisions" -} diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild index 338431363f27..1c16cbb616eb 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,8 +24,6 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="+cube +vulkaninfo X wayland" -# Old packaging will cause file collisions -RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" DEPEND="${PYTHON_DEPS} cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) dev-util/vulkan-headers 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 new file mode 100644 index 000000000000..d3d1c9c446ff --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild @@ -0,0 +1,94 @@ +# 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-Tools.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e" + 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_MIR_SUPPORT=False + -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" + -DVULKANINFO_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-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index c30ba2f16111..d3d1c9c446ff 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="2cfddd146d666efe0ed06ef1d2bc5565821df144" + EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" @@ -24,8 +24,6 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="+cube +vulkaninfo X wayland" -# Old packaging will cause file collisions -RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" DEPEND="${PYTHON_DEPS} cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) dev-util/vulkan-headers -- cgit v1.2.3