summaryrefslogtreecommitdiff
path: root/media-libs/vulkan-loader
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-11-13 13:10:00 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-11-13 13:10:00 +0000
commite9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /media-libs/vulkan-loader
parentfc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)
gentoo resync : 13.11.2021
Diffstat (limited to 'media-libs/vulkan-loader')
-rw-r--r--media-libs/vulkan-loader/Manifest3
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild67
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-9999.ebuild13
3 files changed, 74 insertions, 9 deletions
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 864e2bec056c..509a84a45607 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,6 +2,7 @@ DIST vulkan-loader-1.2.182.tar.gz 1469024 BLAKE2B d180154bd0878c45327b1ad06a8efc
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
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 1768 BLAKE2B 843b07eaa32df0abf97b3c0d24e113ae375d41b81f846514bd33c71fb3d6ae2fd18d18816b299da59e2fe5a39c14c8304777156c95a546be1fa4ed1ac718dadd SHA512 741781dd57a026c7a65caf661b32871557397e55874756dbe100e609cb3ce2400b526e86f2df7e276559310702e95cd8d9cd277eeba4155ef9cd3fa9fe2c2936
+EBUILD vulkan-loader-9999.ebuild 1755 BLAKE2B e8ebe917cf146debe19418fa2f3d7d0d2bdc38260ebaeb4fc5884858b8445969e3f29e2e09353e77eef5943d6862783b0634cac405ce70a8ba022d1fcde1cec4 SHA512 110b2dacae4a48440358113101da867628d4704fa597fe6d631c3b743e4e234a27e8c563278e8095562af6d9a0ca991707ac93dde1da7fea751001578b5cbe8f
MISC metadata.xml 415 BLAKE2B 94633d326c90331f76a9c603a2217bf0ebb2fb397981417c00c45603d6e8c2c1b251f4b22a8905e3fa3dcb684ff0246e774b26c5c9d6ea83c8db75f40166da6e SHA512 2a85db4e86c896c5954f25ed21964d75f7a46d9f6f65bb9676834bb12ee23ba38d02b63aee0c0bc6c3616b9b9f7e6ff13ca0d1cfbfb71a42f07bfeeb242b7b42
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
new file mode 100644
index 000000000000..a0cfbaaf12f3
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
@@ -0,0 +1,67 @@
+# 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"
+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}] )"
+
+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_C_FLAGS="${CFLAGS} -DNDEBUG"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+ -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-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 45bfc80ea55b..035beeeddcc0 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.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
@@ -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() {