summaryrefslogtreecommitdiff
path: root/media-libs/vulkan-loader
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-09-21 18:00:10 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-09-21 18:00:10 +0100
commit265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
treeab18b5617d138f6684566b619405090989d55a2c /media-libs/vulkan-loader
parent586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)
gentoo resync : 21.09.2018
Diffstat (limited to 'media-libs/vulkan-loader')
-rw-r--r--media-libs/vulkan-loader/Manifest8
-rw-r--r--media-libs/vulkan-loader/metadata.xml3
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild65
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild59
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-9999.ebuild4
5 files changed, 66 insertions, 73 deletions
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 519e56f451d6..255b20098cdc 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,9 +2,9 @@ AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 173
AUX vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch 2018 BLAKE2B 354a11d423eabf14ce340117adee3e61e9402997b1894e35661e9c5ef88e85dbe97d65579304359e8484302c69e1bbf0bef22bd98f50ffa74ce1fe6c0355f51e SHA512 91045102cd2b53f2469748b398667d27a23d0a8c56f2a82e454a5634b3a05152af370797eae1153317ec9cf0c854dc9c7547265adf162be2e51f6134fbfa7c58
AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
-DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48
-EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1785 BLAKE2B b14e7913fb9590f0d4aff705ddd0e70120be563b7e37a33418807b58c99fbf2aef17598a60bb1a3d5b6155c797a69065cf34e42035ed34093d9f66d303c82d7b SHA512 3be5109ba59fa832a27b159354a07a115811f45949c74fde265c8753a3fdaa61ded474584fedd62b5c28e859b39796be1fa3e8021ca3e95b6800747596ddfbf0
+DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
EBUILD vulkan-loader-1.1.77.0.ebuild 1673 BLAKE2B df999944df1c2192ad1d523e4c1d5273333818ce12efabf5f4ed18c4e48ebc0c7c538e0708b6fea13b5fc95e7f5fb8c586737a645113049e083cf15606884965 SHA512 375e9482d951f3866ca079a7e4a5205ac71fbf3519a91a21b84dd749abea8a6e6b2441b0d0bccbc14f21e3d786aa0ddc6ffc383f63be2054e25e93847b6a4f78
-EBUILD vulkan-loader-9999.ebuild 1582 BLAKE2B 66c19b3c7d53aeb752606921a61504a4298d6d714c36b27d809aadda683552fd19ab7640578b0a62466dc50651e4f0fea205587d81bfb99e2d0e5e5f3ad13624 SHA512 ac1ee088a9887eb45b8d26106b0e55cf84d14260dc251ba84e1f05be22320745207b2ae1cf32107e99a9d9d2ea86a324a4b636af5e9a28b0190429c56705bf30
-MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
+EBUILD vulkan-loader-1.1.82.0.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
+EBUILD vulkan-loader-9999.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
+MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 5896567b6cb5..6d56c31a9fe5 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -9,7 +9,6 @@
<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
</upstream>
<use>
- <flag name="demos">Build vulkan demos and vulkaninfo</flag>
- <flag name="layers">Build the vulkan layers</flag>
+ <flag name="layers">Include the vulkan layers</flag>
</use>
</pkgmetadata>
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
deleted file mode 100644
index 3f8fd8e41b38..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-LoaderAndValidationLayers.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="demos layers wayland X"
-REQUIRED_USE="demos? ( X )"
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
- demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
- layers? (
- dev-util/glslang:=[${MULTILIB_USEDEP}]
- >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
- )
- wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11:=[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch"
- "${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
- "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
- )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=True
- -DBUILD_TESTS=False
- -DBUILD_LAYERS=$(usex layers)
- -DBUILD_DEMOS=$(usex demos)
- -DBUILD_VKJSON=False
- -DBUILD_LOADER=True
- -DBUILD_WSI_MIR_SUPPORT=False
- -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
- -DBUILD_WSI_XCB_SUPPORT=$(usex X)
- -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
- )
- cmake-utils_src_configure
-}
-
-multilib_src_install() {
- keepdir /etc/vulkan/icd.d
-
- cmake-utils_src_install
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
new file mode 100644
index 000000000000..8fdb1e92bdf8
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
@@ -0,0 +1,59 @@
+# 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-Loader.git"
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ KEYWORDS="~amd64"
+ EGIT_COMMIT="979f925d939e4daa3c823bd2b9d46ca479481fe9"
+ SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+DEPEND="${PYTHON_DEPS}
+ >=dev-util/vulkan-headers-1.1.82.0
+ wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11:=[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+ )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=True
+ -DBUILD_TESTS=False
+ -DBUILD_LOADER=True
+ -DBUILD_WSI_MIR_SUPPORT=False
+ -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+ -DBUILD_WSI_XCB_SUPPORT=$(usex X)
+ -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+ -DVULKAN_HEADERS_INSTALL_DIR="/usr"
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_install() {
+ keepdir /etc/vulkan/icd.d
+
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ einfo "USE=demos has been dropped as per upstream packaging"
+ einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 0331bbbe2b69..8fdb1e92bdf8 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
KEYWORDS="~amd64"
- EGIT_COMMIT="c71d5027a9d7fe4b170c0ff69bad67efd1d530cf"
+ EGIT_COMMIT="979f925d939e4daa3c823bd2b9d46ca479481fe9"
SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
fi
@@ -26,7 +26,7 @@ IUSE="layers wayland X"
PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
DEPEND="${PYTHON_DEPS}
- >=dev-util/vulkan-headers-1.1.77.0-r1
+ >=dev-util/vulkan-headers-1.1.82.0
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
x11-libs/libX11:=[${MULTILIB_USEDEP}]
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 21:05:05 +0000