summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <sarnex@gentoo.org>2018-09-17 19:29:40 -0400
committerNick Sarnie <sarnex@gentoo.org>2018-09-17 20:12:55 -0400
commit1b4ab2d77803fd0843efd0e3b3a9bda620b27bb7 (patch)
treeafe242e2c6232e7d0019bc463e3fb280f42623c2 /dev-util
parentdev-util/vulkan-headers: Bump to 1.1.82.0 (diff)
downloadgentoo-1b4ab2d77803fd0843efd0e3b3a9bda620b27bb7.tar.gz
gentoo-1b4ab2d77803fd0843efd0e3b3a9bda620b27bb7.tar.bz2
gentoo-1b4ab2d77803fd0843efd0e3b3a9bda620b27bb7.zip
dev-util/vulkan-tools: Bump to 1.1.82.0
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/vulkan-tools/Manifest1
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild106
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild30
3 files changed, 119 insertions, 18 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 1fa7abf7d1cb..9c1cc3777d3b 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1 +1,2 @@
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
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
new file mode 100644
index 000000000000..338431363f27
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
@@ -0,0 +1,106 @@
+# 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="2cfddd146d666efe0ed06ef1d2bc5565821df144"
+ 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-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 3fce8b8e6862..338431363f27 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="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
+ EGIT_COMMIT="2cfddd146d666efe0ed06ef1d2bc5565821df144"
KEYWORDS="~amd64"
SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -40,27 +40,21 @@ DEPEND="${PYTHON_DEPS}
REQUIRED_USE="|| ( X wayland )
vulkaninfo? ( X )"
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/vulkancube
- /usr/bin/vulkancubecpp
- /usr/bin/vulkaninfo
-)
-
pkg_setup() {
- MULTILIB_CHOST_TOOLS=()
+ MULTILIB_CHOST_TOOLS=()
- if use vulkaninfo; then
- MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
- fi
+ 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
+ if use cube; then
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/vulkancube
+ /usr/bin/vulkancubecpp
+ )
+ fi
- python-any-r1_pkg_setup
+ python-any-r1_pkg_setup
}
multilib_src_configure() {