summaryrefslogtreecommitdiff
path: root/dev-util/vulkan-tools
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-16 21:23:20 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-16 21:23:20 +0100
commitfab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree10baa743a5340b42ad538dd19d48669ccac209b1 /dev-util/vulkan-tools
parent73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)
gentoo resync : 16.06.2019
Diffstat (limited to 'dev-util/vulkan-tools')
-rw-r--r--dev-util/vulkan-tools/Manifest7
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild (renamed from dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild)17
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild104
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild15
4 files changed, 19 insertions, 124 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 2124ff38ae8d..d6f5d627d47a 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,10 +1,7 @@
-DIST vulkan-tools-1.1.101.tar.gz 351619 BLAKE2B d00a8adc687c6ac513748fd706b7167dd6e929f37ed2315b8c5e7f302976625848e9ad383261e8948adfc6926247676ccec2b6c8143d23343c4022f3a20795db SHA512 e4f5c3236eded7c17f381a9d6cdd20930444c486d0c8c3aaf67f5a46b3787643517e29d3d5d7305e72a60450b0e73daed996a9336a4166ab5241585e85190387
DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82
-DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5
DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
-EBUILD vulkan-tools-1.1.101.ebuild 2208 BLAKE2B 248b656b974acb54eb9131bde630ce7b92f452ebc8f967c73842d86e811ec0e463466140eec8823a60124db0cae6bdca775b56311bd25af1afe251c66e827aab SHA512 4924ab523d4eb964ac0b52e02cd6be6a4122cbf73197501116a121923f6650a147b82094c53bd62a5cd560c0df6ce715e5884ac241a600841684ab8c91debd1a
+EBUILD vulkan-tools-1.1.106-r1.ebuild 2239 BLAKE2B 36561e2807ae45cf69031b8817a655be01cf884c195461d82c1e655f35888ce4ee259e27b93b86427c86d40798c515a7747fcd2dd52fa230ce0a3ecfaf64ce91 SHA512 179ecdcf80e82973a2cb0da825bad34effb4668aedbeeeeba3213ed71c37a479fbc1e8a0db9b06fe0d2c7929f8eb308b5c1c2fcc5bc8d18222782dedd47443f0
EBUILD vulkan-tools-1.1.106.ebuild 2208 BLAKE2B 5a569bd1f034346163b0d5d7e37d1616b8b114ab5107c760187e6c36f49d2ce7808a8502c8210b6649c43f846a5f9cd899c359e741e5f5531a2904cb73592225 SHA512 890af6842861103a98401d84b9452be7f67102cf2ebf0e3bbb41a6f8fd0a896e94d0203408c9d6b17c02847368affd1f5e43e98d74ff410934f506c48f1d8e97
-EBUILD vulkan-tools-1.1.82.0.ebuild 2568 BLAKE2B a3483e8c1fd1983ffd9d98622be5ca1d1420f0da85b767f17bd7acde93b9d2fd15d7ac2b879e0f1bda9b46204163f4aff78bb19a15e9c4b7abab60a19f368a93 SHA512 395ca53f6cb19a39eda8de33c184300017c4b2000a5f17582527afd8edaaa7609b0db3d396a9219d7d3a9c1b5c1803280a639c2574f0600a85fd16f877a08b4e
EBUILD vulkan-tools-1.1.92.0.ebuild 2197 BLAKE2B f444cada3d7d3d3737059861433731d05eebc12330f26adee3aac7b704ac0c13bf966a036f19f2a26344ce0a667a4dc45d02855bd4ce0ff83ea08f4e67ae8726 SHA512 92933038ac146ec3b8dccbc55f194a99a622f94dd67e548319e44573d9800a1550886121b5d6bd01dd55e4b50c14ca2246d280448049c6b710cf50dd1decff93
-EBUILD vulkan-tools-9999.ebuild 2208 BLAKE2B 03b2e4bf54cc433d35c6a4bfdbddb0a704561f41ddb4dca2cf633c5f45f7480ada3c2f19940c262dc79434dcf794e6027ad44840b942c6308aa802f116f3c753 SHA512 65b3dce351b578d2d9c7d8a8f65585caae3a7209d8a54e1e148a8e2e541700091ac8c06068f2182a1d22af7b21fd99b84e9c59d041cffd54f962f8cd12b1f3cc
+EBUILD vulkan-tools-9999.ebuild 2239 BLAKE2B 901c75fa405dd64903eae500f1619a87cde0ed1d75bd9933796815f072999458e8c0395465c14f0980af500b042469325c5eeae46c289ac5af25f712ad4f1e94 SHA512 5ae5762967013a5c9d68f7921a93ae125d912476ce80404bafad9e3f009c484054625172b575268ebe28f255a085fb68e4ac74a7860c941de5c849e4014ce8d8
MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
index d4288937063e..1956a5c0166e 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python3_{5,6} )
if [[ "${PV}" == "9999" ]]; then
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_SUBMODULES=()
inherit git-r3
else
- EGIT_COMMIT="35464647e75e0385973664d8443a6c000f1c292d"
+ 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}"
@@ -23,16 +23,17 @@ 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.101
- media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
+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="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
# Vulkaninfo does not support wayland
REQUIRED_USE="|| ( X wayland )
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
deleted file mode 100644
index cd64798512d9..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 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="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"
-
-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 111b3d75d352..2cac7708424a 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python3_{5,6} )
if [[ "${PV}" == "9999" ]]; then
@@ -23,16 +23,17 @@ 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?]
+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="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
# Vulkaninfo does not support wayland
REQUIRED_USE="|| ( X wayland )