commit:     a8f1b7561646b10a08d5cc14e32c1150c90add76
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 21:03:35 2020 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 07:19:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f1b756

dev-util/vulkan-tools: version bump to 1.2.133

Closes: https://github.com/gentoo/gentoo/pull/14835

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Acked-by: Nick Sarnie <sarnex <AT> gentoo.org>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 dev-util/vulkan-tools/Manifest                    |  1 +
 dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild | 94 +++++++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index ebaf3ed5372..44a327d2acf 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1 +1,2 @@
 DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 
6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422
 SHA512 
9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
+DIST vulkan-tools-1.2.133.tar.gz 691639 BLAKE2B 
6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422
 SHA512 
9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421

diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild 
b/dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild
new file mode 100644
index 00000000000..8a03a60cf6d
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.133.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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";
+       EGIT_SUBMODULES=()
+       inherit git-r3
+else
+       EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
+       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}"
+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-${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-${PV}
+       ${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# 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
+}

Reply via email to