diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-util/vulkan-tools | |
parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) |
gentoo resync : 02.08.2019
Diffstat (limited to 'dev-util/vulkan-tools')
-rw-r--r-- | dev-util/vulkan-tools/Manifest | 7 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild | 4 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild | 92 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild | 92 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 6 |
5 files changed, 7 insertions, 194 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 66d0366c0855..1388d2847cee 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,7 +1,4 @@ DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82 -DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc -EBUILD vulkan-tools-1.1.106-r1.ebuild 2238 BLAKE2B 9ace21e7f1a360a1409200087e9206b330b538e84b5d633bb58eac03153190b2b0a0ead1e8fc2e0fa5a9684bfcda5c9c1fd8d8dcf3aa2a51f5cb3bf273ae2ca1 SHA512 a50ffccdb2057b7c3c4b712da5b5a9c60e561f170ca47cc6def18684c6a9c2b9ac92b13845f21d5c666603fa55f76f9dc932717f437aa25fc32242aa70534277 -EBUILD vulkan-tools-1.1.106.ebuild 2208 BLAKE2B 5a569bd1f034346163b0d5d7e37d1616b8b114ab5107c760187e6c36f49d2ce7808a8502c8210b6649c43f846a5f9cd899c359e741e5f5531a2904cb73592225 SHA512 890af6842861103a98401d84b9452be7f67102cf2ebf0e3bbb41a6f8fd0a896e94d0203408c9d6b17c02847368affd1f5e43e98d74ff410934f506c48f1d8e97 -EBUILD vulkan-tools-1.1.92.0.ebuild 2197 BLAKE2B f444cada3d7d3d3737059861433731d05eebc12330f26adee3aac7b704ac0c13bf966a036f19f2a26344ce0a667a4dc45d02855bd4ce0ff83ea08f4e67ae8726 SHA512 92933038ac146ec3b8dccbc55f194a99a622f94dd67e548319e44573d9800a1550886121b5d6bd01dd55e4b50c14ca2246d280448049c6b710cf50dd1decff93 -EBUILD vulkan-tools-9999.ebuild 2239 BLAKE2B 901c75fa405dd64903eae500f1619a87cde0ed1d75bd9933796815f072999458e8c0395465c14f0980af500b042469325c5eeae46c289ac5af25f712ad4f1e94 SHA512 5ae5762967013a5c9d68f7921a93ae125d912476ce80404bafad9e3f009c484054625172b575268ebe28f255a085fb68e4ac74a7860c941de5c849e4014ce8d8 +EBUILD vulkan-tools-1.1.106-r1.ebuild 2237 BLAKE2B 7fb55b694f9fe0fa8c6b2ba8978e06b05866a7f977382141b5ae13519050e816741f77825ed9100649d84581a22bf700b21c583758aeeffea8555576a3416b8f SHA512 cd1931161a4fa56c6e8ebbdab0fa4ccb04f22ed42a54e753c25a9e3daa3d8f898a897174604882d812a8ba69f9f916ea79a0c83472e8925af54c1f8e39e0276a +EBUILD vulkan-tools-9999.ebuild 2240 BLAKE2B e092fb1d0a2553e1d45ce151df9b0d72e7430f8340f063c77a5e455cc9938cd25e51b48b18ccef56057790903eeef8dde7d33d2e3b64864ab00407638d789bb4 SHA512 11928348b83856cac67c825a76142cb107c95a42d1cd23cf4805d4b152c01cd47922174ef77de40d8de641b01b9457e1604ccd63e8ef7c9d17ae60f8b52c3208 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild index 8c9610536b66..4b5027533226 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="+cube +vulkaninfo X wayland" +IUSE="+cube +vulkaninfo +X wayland" COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( @@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}" # Vulkaninfo does not support wayland REQUIRED_USE="|| ( X wayland ) - vulkaninfo? ( X )" + vulkaninfo? ( X )" pkg_setup() { MULTILIB_CHOST_TOOLS=() diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild deleted file mode 100644 index ddc3a474aef8..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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" - -DEPEND="${PYTHON_DEPS} - cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) - >=dev-util/vulkan-headers-1.1.106 - 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_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.92.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild deleted file mode 100644 index f3e214574ec9..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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="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_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 2cac7708424a..574fee54f75e 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6} ) +PYTHON_COMPAT=( python3_{5,6,7} ) if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" @@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="+cube +vulkaninfo X wayland" +IUSE="+cube +vulkaninfo +X wayland" COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( @@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}" # Vulkaninfo does not support wayland REQUIRED_USE="|| ( X wayland ) - vulkaninfo? ( X )" + vulkaninfo? ( X )" pkg_setup() { MULTILIB_CHOST_TOOLS=() |