diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-util/vulkan-tools | |
parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) |
gentoo resync : 03.11.2019
Diffstat (limited to 'dev-util/vulkan-tools')
-rw-r--r-- | dev-util/vulkan-tools/Manifest | 5 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild | 94 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild | 94 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 7 |
4 files changed, 196 insertions, 4 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 1388d2847cee..f32eafbe21b3 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,4 +1,7 @@ DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82 +DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421 EBUILD vulkan-tools-1.1.106-r1.ebuild 2237 BLAKE2B 7fb55b694f9fe0fa8c6b2ba8978e06b05866a7f977382141b5ae13519050e816741f77825ed9100649d84581a22bf700b21c583758aeeffea8555576a3416b8f SHA512 cd1931161a4fa56c6e8ebbdab0fa4ccb04f22ed42a54e753c25a9e3daa3d8f898a897174604882d812a8ba69f9f916ea79a0c83472e8925af54c1f8e39e0276a -EBUILD vulkan-tools-9999.ebuild 2240 BLAKE2B e092fb1d0a2553e1d45ce151df9b0d72e7430f8340f063c77a5e455cc9938cd25e51b48b18ccef56057790903eeef8dde7d33d2e3b64864ab00407638d789bb4 SHA512 11928348b83856cac67c825a76142cb107c95a42d1cd23cf4805d4b152c01cd47922174ef77de40d8de641b01b9457e1604ccd63e8ef7c9d17ae60f8b52c3208 +EBUILD vulkan-tools-1.1.106-r2.ebuild 2272 BLAKE2B a04e6131440f0f6c246636c14f1107433e3718380dfb9d4e6ed79a7c3d5df89f80921edc8bb565dfa1529fc63eef105ba0dfdad217b6e1126db40f0da8317193 SHA512 8f4ee978eca947e4838344a46b20911207a52a65b902bd5ee693c55a271287bb04177b27ce58e5a6986999afc86eb5613678ba11300779014e532fb629e8682c +EBUILD vulkan-tools-1.1.124.ebuild 2285 BLAKE2B 77909d1d8d44e281b3fe984330b7e1c5c0d8391d87f1897287a6130a6a4afb97e78577d81edf0d9b1dea0ab29458d4da498bf384b6a5b55da1444c20b65b02ad SHA512 a2aa7fe9a5056cc1e2c4ee2a93602ff2d43d22021ef4e685c9babe33f4f70f52fe437878ab8ddeafc2b29e7aeb86532e217e076a2859d91bc84fc325ff9a7b70 +EBUILD vulkan-tools-9999.ebuild 2285 BLAKE2B 77909d1d8d44e281b3fe984330b7e1c5c0d8391d87f1897287a6130a6a4afb97e78577d81edf0d9b1dea0ab29458d4da498bf384b6a5b55da1444c20b65b02ad SHA512 a2aa7fe9a5056cc1e2c4ee2a93602ff2d43d22021ef4e685c9babe33f4f70f52fe437878ab8ddeafc2b29e7aeb86532e217e076a2859d91bc84fc325ff9a7b70 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild new file mode 100644 index 000000000000..924b70dd8d81 --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8" + 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" +COMMON_DEPEND="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}] + )" + +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 )" + +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.124.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild new file mode 100644 index 000000000000..3c0376f76251 --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,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" + 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-1.1.125:=[${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 )" + +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-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 574fee54f75e..3c0376f76251 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="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e" + EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9" KEYWORDS="~amd64" SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" @@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" LICENSE="Apache-2.0" SLOT="0" IUSE="+cube +vulkaninfo +X wayland" -COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] +COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] @@ -32,7 +32,8 @@ COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] BDEPEND="${PYTHON_DEPS} cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )" -DEPEND="${COMMON_DEPEND}" +DEPEND=">=dev-util/vulkan-headers-1.1.125 + ${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" # Vulkaninfo does not support wayland |