From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46B9513835A for ; Wed, 17 Jun 2020 05:46:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 716BDE0A03; Wed, 17 Jun 2020 05:46:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 451EAE0A03 for ; Wed, 17 Jun 2020 05:46:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B15AD34F0AE for ; Wed, 17 Jun 2020 05:46:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6E2B2A4 for ; Wed, 17 Jun 2020 05:46:07 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1592372758.76e2d37aab266e01d268cef8235ca1c3224e3fd8.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/vulkan-tools/Manifest dev-util/vulkan-tools/metadata.xml dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild X-VCS-Directories: dev-util/vulkan-tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 76e2d37aab266e01d268cef8235ca1c3224e3fd8 X-VCS-Branch: master Date: Wed, 17 Jun 2020 05:46:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a52ae95f-7e1e-4c7f-9242-f4fd37e3cc22 X-Archives-Hash: cee1c0ec5c61fceddc992598f37412d8 commit: 76e2d37aab266e01d268cef8235ca1c3224e3fd8 Author: Matt Turner gentoo org> AuthorDate: Wed Jun 17 05:35:52 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Jun 17 05:45:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e2d37a dev-util/vulkan-tools: Drop old versions Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matt Turner gentoo.org> dev-util/vulkan-tools/Manifest | 3 - dev-util/vulkan-tools/metadata.xml | 1 - dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild | 94 ---------------------- .../vulkan-tools/vulkan-tools-1.2.133-r1.ebuild | 81 ------------------- dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild | 81 ------------------- 5 files changed, 260 deletions(-) diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 0e381af1300..af9217997c4 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,5 +1,2 @@ -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 DIST vulkan-tools-1.2.137.tar.gz 710528 BLAKE2B be7d2110f2ca9df5e3c2e898a4e985252f5e6568d061d2842a91cc95941bdd00e9662f6aeba4acacaf7c9a0abfe61915baded15be0ef2a4c43a4b57a5a04e99b SHA512 879529ccea9a894f62222cd0110b946ddf055f092994bf71942a3c5c50906dc062edc5081ea2150757cdb501426ca341e9a4260319c6565acdcb731f172d43d8 DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337 diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml index bee42ed5665..9d9218cb035 100644 --- a/dev-util/vulkan-tools/metadata.xml +++ b/dev-util/vulkan-tools/metadata.xml @@ -11,7 +11,6 @@ Build the cube/cubepp demos - Build the vulkaninfo utility KhronosGroup/Vulkan-Tools diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild deleted file mode 100644 index 4abdb96716d..00000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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-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-1.2.133-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild deleted file mode 100644 index ff7a561dba6..00000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# 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 deleted file mode 100644 index 1d6d8e74d61..00000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# 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 -}