From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-libs/vulkan-loader/Manifest | 6 +- .../vulkan-loader/vulkan-loader-1.2.137.ebuild | 66 ---------------------- .../vulkan-loader/vulkan-loader-1.2.141-r1.ebuild | 66 ++++++++++++++++++++++ .../vulkan-loader/vulkan-loader-1.2.141.ebuild | 66 ---------------------- media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 2 +- 5 files changed, 69 insertions(+), 137 deletions(-) delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild create mode 100644 media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild (limited to 'media-libs/vulkan-loader') diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index eb6ec54cb3eb..9537c0519761 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,6 +1,4 @@ -DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796 DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26 -EBUILD vulkan-loader-1.2.137.ebuild 1710 BLAKE2B 3427e40938c277700720bc50df5b0583f10ccfed19025bf0a6e7ed0cfae364ab8e3e1b420a0b2266f832c5ef7b0f574d03efee3658420771ff147698e11f3576 SHA512 f5923a57cfa7e80052e26eb3645771c7f9c506e638075d32186cc00ddd7e42c8e5c5f033554d7a8c624faff6a6dfd3ca9a78e2a4333d62e7f669c0df142d4ba0 -EBUILD vulkan-loader-1.2.141.ebuild 1710 BLAKE2B ace0b28fd303ae99b0ed7b4878ac2538534863f89f4a1442473db1508e570cfc5ebf0bd1a9b8d3e0bdc4d7f5a0c803ddd4ce02a0f62d13e4e17d3e00918b6978 SHA512 8004d2d27090080f0ee60f9d708ad0d51ee5335aa6301c92126a1972d692ebd85e0361c7779dd1cb0698eed7f6babccbde8628f264ab1c0ae54c5b63fbf520a1 -EBUILD vulkan-loader-9999.ebuild 1711 BLAKE2B 8a7cfcd2603391ba298c407b8fc5eff6bc6364bd650ffa6e07637ccfad00aea16ea813c81d6855fa6b84049f59e8eca039967a1cf89d8a2ddaaaa1ed4e8153df SHA512 f561c79296a73545c3cbca97d1807e57549869c9bff4f81aaa017d8846a3b28cd85208f1956af8b51982896411aea2c7f94ff6b77f97026a7da2d77ac5ec092b +EBUILD vulkan-loader-1.2.141-r1.ebuild 1728 BLAKE2B 0ebf14b0acede3f370ac139c69ff2f92c354de9145aa8d96a1ea0ef23e2251e3827f23e231010c77e8663ba8a0f46cba1ecb6d937acdb04e9d004bab27195f37 SHA512 fc789bb294e1d99e5609c8db8e97c6765e83ac92ca70bb683ba35a9df6754d2835cef2ca1e52a02d7707e4fa90c36d2d55a7ea6ec674df9e6325a88bbb949474 +EBUILD vulkan-loader-9999.ebuild 1712 BLAKE2B 357fc2e387a06a491ed88d020fe49cfb711207746d8efb1399540295d433c3a146402ba922b21af6d7972b31b23b78a6e0e4a59b2ea8161c70a49fbea6494316 SHA512 2c549cad68ca8363b97c4cd9354398b458789eb80fb724f79b40be7ad05bd076df003f00b19035e7f43a953d33e434b9bdee7070d0a2fd6ee8f17204d5a04067 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417 diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild deleted file mode 100644 index 0246966ff47f..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=Vulkan-Loader -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs - -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 x86" - S="${WORKDIR}"/${MY_PN}-${PV} -fi - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="layers wayland X" - -BDEPEND=">=dev-util/cmake-3.10.2" -DEPEND="${PYTHON_DEPS} - ~dev-util/vulkan-headers-1.2.137 - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" -PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - # Integrated clang assembler doesn't work with x86 - Bug #698164 - if tc-is-clang && [[ ${ABI} == x86 ]]; then - append-cflags -fno-integrated-as - fi - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DBUILD_TESTS=OFF - -DBUILD_LOADER=ON - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" - ) - cmake_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - cmake_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-1.2.141-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild new file mode 100644 index 000000000000..1d88e48af04f --- /dev/null +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=Vulkan-Loader +CMAKE_ECLASS="cmake" +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs + +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 ~arm ~arm64 ~ppc ~ppc64 x86" + S="${WORKDIR}"/${MY_PN}-${PV} +fi + +DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="layers wayland X" + +BDEPEND=">=dev-util/cmake-3.10.2" +DEPEND="${PYTHON_DEPS} + ~dev-util/vulkan-headers-1.2.143 + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" + +multilib_src_configure() { + # Integrated clang assembler doesn't work with x86 - Bug #698164 + if tc-is-clang && [[ ${ABI} == x86 ]]; then + append-cflags -fno-integrated-as + fi + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_TESTS=OFF + -DBUILD_LOADER=ON + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" + ) + cmake_src_configure +} + +multilib_src_install() { + keepdir /etc/vulkan/icd.d + + cmake_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-1.2.141.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild deleted file mode 100644 index 71f3ce8b1cf8..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=Vulkan-Loader -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs - -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 x86" - S="${WORKDIR}"/${MY_PN}-${PV} -fi - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="layers wayland X" - -BDEPEND=">=dev-util/cmake-3.10.2" -DEPEND="${PYTHON_DEPS} - ~dev-util/vulkan-headers-1.2.143 - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" -PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - # Integrated clang assembler doesn't work with x86 - Bug #698164 - if tc-is-clang && [[ ${ABI} == x86 ]]; then - append-cflags -fno-integrated-as - fi - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DBUILD_TESTS=OFF - -DBUILD_LOADER=ON - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" - ) - cmake_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - cmake_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 f6e5a7abb270..c09d888cf7a6 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -49,7 +49,7 @@ multilib_src_configure() { -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) cmake_src_configure } -- cgit v1.2.3