diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
| commit | b2be182d49eea46686b5cf2680d457df61e89dc4 (patch) | |
| tree | c66442ced2011c5ca81c3114cc51041e314c6d33 /media-libs/vulkan-loader | |
| parent | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff) | |
gentoo resync : 30.06.2018
Diffstat (limited to 'media-libs/vulkan-loader')
| -rw-r--r-- | media-libs/vulkan-loader/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild (renamed from media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild) | 35 | ||||
| -rw-r--r-- | media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 5 |
3 files changed, 21 insertions, 24 deletions
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index d336207148fd..9ca81c798a52 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -2,7 +2,8 @@ AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 173 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 -EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681 -EBUILD vulkan-loader-9999.ebuild 1502 BLAKE2B 1286fa5cef46bc3a3a27f247824d130fe7d1b08ebc40ab0486610519afc5ed4d57bbf3b0c68a4b1d8daca6186414b4a544cfd9099b2e6801ed3369338ed8e7bb SHA512 b306b5d6d8df2b5b257e155d94b7bd4a56c8cf48ef84b57f89ffb7157463f683ad848df9c1f8ca481d75118c36bddb2ba9d46537c6799278b86c4f0edc2f314d +EBUILD vulkan-loader-1.1.77.0.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510 +EBUILD vulkan-loader-9999.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574 diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild index 4bed360605f5..4f7ccd73988b 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild @@ -5,54 +5,44 @@ EAPI=6 PYTHON_COMPAT=( python3_{4,5,6} ) if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git" + EGIT_SUBMODULES=() inherit git-r3 else KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" + EGIT_COMMIT="c71d5027a9d7fe4b170c0ff69bad67efd1d530cf" + 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-LoaderAndValidationLayers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" LICENSE="Apache-2.0" SLOT="0" -IUSE="demos layers wayland X" -REQUIRED_USE="demos? ( X )" +IUSE="layers wayland X" -RDEPEND="" +PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} - demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) - layers? ( - dev-util/glslang:=[${MULTILIB_USEDEP}] - >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] - ) + dev-util/vulkan-headers 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}-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) + -DVULKAN_HEADERS_INSTALL_DIR="/usr" ) cmake-utils_src_configure } @@ -62,3 +52,8 @@ multilib_src_install() { 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 9e7474822138..4f7ccd73988b 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -10,8 +10,9 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 else KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-Loader-sdk-${PV}" + EGIT_COMMIT="c71d5027a9d7fe4b170c0ff69bad67efd1d530cf" + 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 |