summaryrefslogtreecommitdiff
path: root/media-libs/vulkan-loader
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
commit2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
treec8af0fd04194aed03cf067d44e53c7edd3e9ab84 /media-libs/vulkan-loader
parente9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
gentoo resync : 05.12.2021
Diffstat (limited to 'media-libs/vulkan-loader')
-rw-r--r--media-libs/vulkan-loader/Manifest10
-rw-r--r--media-libs/vulkan-loader/metadata.xml4
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild70
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild (renamed from media-libs/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild)17
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-9999.ebuild4
6 files changed, 19 insertions, 88 deletions
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 509a84a45607..4f9e12f3295d 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,8 +1,8 @@
DIST vulkan-loader-1.2.182.tar.gz 1469024 BLAKE2B d180154bd0878c45327b1ad06a8efcc637b73fd75ad5ca349740d7f8d6944b2974828cb055a32150c4db4eb94f1b420d94852228d91e46bd8340229fa0ad30fd SHA512 06cf308caae1fd1992b279e8130b8f40bdcc7df44294c73e221d537950c689e552afeda4ae9406645b1d773693fa27c7727ab012daecbcff2793c4995c7f0db0
DIST vulkan-loader-1.2.189.tar.gz 1508029 BLAKE2B d889c398d886e2bd6082bdd4f728078986b15610da478634475c2b17f860bf127fa5b81d409f1298d4d3705a1b9274bb982447a425a930ac5ac3fe44de6aaa08 SHA512 358bda8081bf86b0cc119c15ed791d63e4fc7273d95e550dac11dfadf3d3f9b709936207a9b0fc3b53595b9f46c41d47f573613c5d57e789b58405a5a5cd5b14
-EBUILD vulkan-loader-1.2.182-r1.ebuild 1768 BLAKE2B 843b07eaa32df0abf97b3c0d24e113ae375d41b81f846514bd33c71fb3d6ae2fd18d18816b299da59e2fe5a39c14c8304777156c95a546be1fa4ed1ac718dadd SHA512 741781dd57a026c7a65caf661b32871557397e55874756dbe100e609cb3ce2400b526e86f2df7e276559310702e95cd8d9cd277eeba4155ef9cd3fa9fe2c2936
+DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
EBUILD vulkan-loader-1.2.182.ebuild 1667 BLAKE2B 75d53c06a5e6e626a5bcb760e39906067b90fca29e4ddf8fca11f9f3da90541a7d3fc08fd4975e6a2c106c8473e3ec2fc852b3f2e37bbfc3ba9c33dc9dda7bf3 SHA512 43696cc21f3b86c0a6877e55477f50bc28c98794679b164266a3bd77f16ec98f4db8f0085c4551a698287c384f847a0d2e3cecf2072bb38eead9d3ebf87efe64
-EBUILD vulkan-loader-1.2.189-r1.ebuild 1753 BLAKE2B 4c6bea321968924514a5fe89ccd43aa33e9882e98ecc4d903b955595d513347d869c2fdb32bf5c411bcc00b7f3b0177c4a6468e6cd6cafe6edd9fad7f0edb147 SHA512 3ec16027e0b2e7b3dd4ebb58f974c97ef2c0a480c2a7046ac1946cb5dde2d2a48e0397d0773740e882426d23d31b2bb1bf0c95fd803cd0df29576f3061fe42bc
-EBUILD vulkan-loader-1.2.189.ebuild 1768 BLAKE2B 843b07eaa32df0abf97b3c0d24e113ae375d41b81f846514bd33c71fb3d6ae2fd18d18816b299da59e2fe5a39c14c8304777156c95a546be1fa4ed1ac718dadd SHA512 741781dd57a026c7a65caf661b32871557397e55874756dbe100e609cb3ce2400b526e86f2df7e276559310702e95cd8d9cd277eeba4155ef9cd3fa9fe2c2936
-EBUILD vulkan-loader-9999.ebuild 1755 BLAKE2B e8ebe917cf146debe19418fa2f3d7d0d2bdc38260ebaeb4fc5884858b8445969e3f29e2e09353e77eef5943d6862783b0634cac405ce70a8ba022d1fcde1cec4 SHA512 110b2dacae4a48440358113101da867628d4704fa597fe6d631c3b743e4e234a27e8c563278e8095562af6d9a0ca991707ac93dde1da7fea751001578b5cbe8f
-MISC metadata.xml 415 BLAKE2B 94633d326c90331f76a9c603a2217bf0ebb2fb397981417c00c45603d6e8c2c1b251f4b22a8905e3fa3dcb684ff0246e774b26c5c9d6ea83c8db75f40166da6e SHA512 2a85db4e86c896c5954f25ed21964d75f7a46d9f6f65bb9676834bb12ee23ba38d02b63aee0c0bc6c3616b9b9f7e6ff13ca0d1cfbfb71a42f07bfeeb242b7b42
+EBUILD vulkan-loader-1.2.189-r1.ebuild 1749 BLAKE2B 01a80f1c37d590fde2f2b08d91e0abadac06f5bd511b35a6b0a6ed447046973e0479c1296b70e937b1bdc8733b1d629c00a5b96d02ec34385947fc0488c984a8 SHA512 8622292a36a4b506822522efb64043ba676affa83d511a6e611b768f00548d663734e4d8f71f212701feb65cd210cc039ffb042a266c885e4d6d260d996c3cc0
+EBUILD vulkan-loader-1.2.198.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
+EBUILD vulkan-loader-9999.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
+MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 292de6dc5063..ff730de5d43a 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -5,6 +5,10 @@
<email>x11@gentoo.org</email>
<name>X11</name>
</maintainer>
+ <maintainer type="person">
+ <email>sarnex@gentoo.org</email>
+ <name>Nick Sarnie</name>
+ </maintainer>
<upstream>
<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
</upstream>
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
index a0cfbaaf12f3..788fdacbefeb 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
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 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild
deleted file mode 100644
index 45bfc80ea55b..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit flag-o-matic cmake-multilib 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 ~riscv ~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="
- ~dev-util/vulkan-headers-${PV}
- 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}] )"
-
-src_prepare() {
- cmake-utils_src_prepare
-}
-
-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-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-1.2.182-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
index 45bfc80ea55b..18dc41ace6c3 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
@@ -4,8 +4,7 @@
EAPI=7
MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
inherit flag-o-matic cmake-multilib toolchain-funcs
if [[ ${PV} == *9999* ]]; then
@@ -13,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
EGIT_SUBMODULES=()
inherit git-r3
else
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
- S="${WORKDIR}"/${MY_PN}-${PV}
+ S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
@@ -36,10 +35,6 @@ DEPEND="
"
PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-src_prepare() {
- cmake-utils_src_prepare
-}
-
multilib_src_configure() {
# Integrated clang assembler doesn't work with x86 - Bug #698164
if tc-is-clang && [[ ${ABI} == x86 ]]; then
@@ -47,6 +42,8 @@ multilib_src_configure() {
fi
local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-DCMAKE_SKIP_RPATH=ON
-DBUILD_TESTS=OFF
-DBUILD_LOADER=ON
@@ -55,13 +52,13 @@ multilib_src_configure() {
-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
multilib_src_install() {
keepdir /etc/vulkan/icd.d
- cmake-utils_src_install
+ cmake_src_install
}
pkg_postinst() {
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 035beeeddcc0..18dc41ace6c3 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
EGIT_SUBMODULES=()
inherit git-r3
else
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
- S="${WORKDIR}"/${MY_PN}-${PV}
+ S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"