From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-util/vulkan-tools/Manifest | 6 +- .../vulkan-tools/vulkan-tools-1.2.133-r1.ebuild | 81 ++++++++++++++++++ dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild | 81 ++++++++++++++++++ dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 95 ++++++++++------------ 4 files changed, 208 insertions(+), 55 deletions(-) create mode 100644 dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild create mode 100644 dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild (limited to 'dev-util/vulkan-tools') diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 38159ee96c8d..cbd8c4437320 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,4 +1,8 @@ DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421 +DIST vulkan-tools-1.2.133a.tar.gz 698176 BLAKE2B 55f1b298a5daf7c656492c75999002aa54811df448f635e6d0c95cf717ae00c8d8158c39557c3c646281f1b763a848716d1a4429540a5a3a137462e355338427 SHA512 3f7a431b6889e2d62d16105b928707b9ae9d77515398284bfde8ced7b0741523f0b37c281c789d5c786c089854010edb9c7b18ed373f342ca0db7533ec9fd698 +DIST vulkan-tools-1.2.135.tar.gz 709765 BLAKE2B 3e25e8936ebad2b5488618ec3680a322e9b3b20976cbf8e61b37702482e2203bc93c6f63ad5122688e074e9f1b178c57fa32b623ca07321fd7fb08b5aec9eef3 SHA512 604f4815b837bffca132fc0cb6f155ad59c8c13d68dea70d1ca18d1595c6c834f296faac551467766b5e7fe3e3afa3e91c0bb299b365603de2719df9232dde40 EBUILD vulkan-tools-1.1.124.ebuild 2289 BLAKE2B 9ef4efda8cfbe0b26afb75e983a91552a25d32a788f6f24f28e5a2cff0bda510be9b2895b708c047bc07dd74544ca043aa7d465dc15be13dd31fb6d443e242a9 SHA512 f877f93a5e449cc497ad3cae1a35f4289a3d3b3d81c762d9a7f68e7024548dd68d2021bcae93166ad8c4e7756d931e63612579cd55fb4d2a27fe451291134e33 -EBUILD vulkan-tools-9999.ebuild 2290 BLAKE2B 4eaaf1b8a37672216bdbbbf35f55713d2b379095607050e939b166e61240f3f569cfd170af6eb90358419c71c2cf2ec9ef947e661ead5bc7f3dc94a8e296f2ef SHA512 eb5660a4dad48b69efe4054990a7d19f05dd1d5aad4e026c0315c08d1ba520e2d1b421d983b1a1b30559fcf9def1bd4af800c161ae4c2552e79ec74e66c70fbf +EBUILD vulkan-tools-1.2.133-r1.ebuild 1870 BLAKE2B 255a251faaad7fce7731196a7e15ec2726a821bae1392af9cf802d6bc85c7b66428f51521d0e61b7c9674cb4c67946a5056fa1efa3dbc45ccd514247a9218c04 SHA512 7f1996a305286d3827adb41ceb3d31469024f54d9318970fb7f536b17a8ec26cedc8305725c754211b29bd6040b43f1bd45e63c6772da21c6b6b157a51b1691f +EBUILD vulkan-tools-1.2.135.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd +EBUILD vulkan-tools-9999.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild new file mode 100644 index 000000000000..ff7a561dba67 --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=Vulkan-Tools +CMAKE_ECLASS="cmake" +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}a.tar.gz" + KEYWORDS="~amd64 ~ppc64" + S="${WORKDIR}"/${MY_PN}-${PV} +fi + +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 wayland +X" + +# Cube demo only supports one window system at a time +REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )" + +BDEPEND="${PYTHON_DEPS} + >=dev-util/cmake-3.10.2 + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + >=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + >=dev-util/vulkan-headers-${PV} +" + +pkg_setup() { + MULTILIB_CHOST_TOOLS=( + /usr/bin/vulkaninfo + ) + + use cube && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube + /usr/bin/vkcubepp + ) + + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_VULKANINFO=ON + -DBUILD_CUBE=$(usex cube) + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + ) + + use cube && mycmakeargs+=( + -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" + -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) + ) + + cmake_src_configure +} + +multilib_src_install() { + cmake_src_install +} diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild new file mode 100644 index 000000000000..1d6d8e74d61e --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=Vulkan-Tools +CMAKE_ECLASS="cmake" +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64" + S="${WORKDIR}"/${MY_PN}-${PV} +fi + +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 wayland +X" + +# Cube demo only supports one window system at a time +REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )" + +BDEPEND="${PYTHON_DEPS} + >=dev-util/cmake-3.10.2 + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + >=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + >=dev-util/vulkan-headers-${PV} +" + +pkg_setup() { + MULTILIB_CHOST_TOOLS=( + /usr/bin/vulkaninfo + ) + + use cube && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube + /usr/bin/vkcubepp + ) + + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_VULKANINFO=ON + -DBUILD_CUBE=$(usex cube) + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + ) + + use cube && mycmakeargs+=( + -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" + -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) + ) + + cmake_src_configure +} + +multilib_src_install() { + cmake_src_install +} diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 70535b3958e7..1d6d8e74d61e 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -2,93 +2,80 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" +MY_PN=Vulkan-Tools +CMAKE_ECLASS="cmake" +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" EGIT_SUBMODULES=() inherit git-r3 else - EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9" + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~ppc64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" + S="${WORKDIR}"/${MY_PN}-${PV} 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" -COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?] +IUSE="cube wayland +X" + +# Cube demo only supports one window system at a time +REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )" + +BDEPEND="${PYTHON_DEPS} + >=dev-util/cmake-3.10.2 + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + >=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - )" - -BDEPEND="${PYTHON_DEPS} - cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )" -DEPEND=">=dev-util/vulkan-headers-1.1.125 - ${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# Vulkaninfo does not support wayland -REQUIRED_USE="|| ( X wayland ) - vulkaninfo? ( X )" + ) +" +DEPEND="${RDEPEND} + >=dev-util/vulkan-headers-${PV} +" pkg_setup() { - MULTILIB_CHOST_TOOLS=() - - if use vulkaninfo; then - MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo ) - fi + MULTILIB_CHOST_TOOLS=( + /usr/bin/vulkaninfo + ) - if use cube; then - MULTILIB_CHOST_TOOLS+=( - /usr/bin/vkcube - /usr/bin/vkcubepp - ) - fi + use cube && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube + /usr/bin/vkcubepp + ) python-any-r1_pkg_setup } multilib_src_configure() { local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True + -DCMAKE_SKIP_RPATH=ON + -DBUILD_VULKANINFO=ON -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" + -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/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 + use cube && mycmakeargs+=( + -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" + -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) + ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_install() { - cmake-utils_src_install + cmake_src_install } -- cgit v1.2.3