media-libs/vulkan-loader: Fix deps

Closes: https://bugs.gentoo.org/724870
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
new file mode 100644 (file)
index 0000000..703cf77
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+if [[ "${PV}" == "9999" ]]; then
+       EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+       EGIT_SUBMODULES=()
+       inherit git-r3
+else
+       if [[ -z ${SNAPSHOT_COMMIT} ]]; then
+               MY_PV=v${PV}
+               MY_P=Vulkan-Loader-${PV}
+       else
+               MY_PV=${SNAPSHOT_COMMIT}
+               MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
+       fi
+       KEYWORDS="~amd64 ~ppc64 ~x86"
+       SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+       S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-funcs 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-${PV}
+       wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+       X? (
+               x11-libs/libX11:=[${MULTILIB_USEDEP}]
+               x11-libs/libXrandr:=[${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=True
+               -DBUILD_TESTS=False
+               -DBUILD_LOADER=True
+               -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-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.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
index 60deb31aa071442792a62e60c79d7a37bc3f5524..33cdb2c53840a2026f2d95c5dd51bf474ac71320 100644 (file)
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-       >=dev-util/vulkan-headers-${PV}
+       ~dev-util/vulkan-headers-${PV}
        wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
        X? (
                x11-libs/libX11:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
index 313f090553bbfb556ac1c5301bc12cef484497a6..45a674083b072c14dc90087e265302e71868bdf8 100644 (file)
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-       >=dev-util/vulkan-headers-1.2.136
+       ~dev-util/vulkan-headers-1.2.136
        wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
        X? (
                x11-libs/libX11:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
index d47301d0d52a141ba043ac5391bc3c7f235d7f61..0c346926f2c608ed9a22466daf30a3ea684c3bda 100644 (file)
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-       >=dev-util/vulkan-headers-1.2.137
+       ~dev-util/vulkan-headers-1.2.137
        wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
        X? (
                x11-libs/libX11:=[${MULTILIB_USEDEP}]