From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- app-emulation/vkd3d/Manifest | 6 ++++-- app-emulation/vkd3d/vkd3d-1.0.ebuild | 7 ++----- app-emulation/vkd3d/vkd3d-1.1.ebuild | 39 +++++++++++++++++++++++++++++++++++ app-emulation/vkd3d/vkd3d-9999.ebuild | 7 ++----- 4 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 app-emulation/vkd3d/vkd3d-1.1.ebuild (limited to 'app-emulation/vkd3d') diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest index 0296a4f3277f..6e3a883f0c0d 100644 --- a/app-emulation/vkd3d/Manifest +++ b/app-emulation/vkd3d/Manifest @@ -1,4 +1,6 @@ DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615 -EBUILD vkd3d-1.0.ebuild 1008 BLAKE2B cd9d65a6a8b0bf9d8d78fdac4f4a1c92f65f4492b88f0f05552c6e2244c495a4a3cb68a620173844bfa9aae3ebc05eb9efc28d8429a617fb226d37dae390b3fc SHA512 330c7dd9e298c11575929f8d9c6db51ab509ba87505af0317ab5cf08ce5ca9061262e3f677f0cafa195212e91b93a925c753028dd15a83147c810d64dd07ce84 -EBUILD vkd3d-9999.ebuild 1008 BLAKE2B cd9d65a6a8b0bf9d8d78fdac4f4a1c92f65f4492b88f0f05552c6e2244c495a4a3cb68a620173844bfa9aae3ebc05eb9efc28d8429a617fb226d37dae390b3fc SHA512 330c7dd9e298c11575929f8d9c6db51ab509ba87505af0317ab5cf08ce5ca9061262e3f677f0cafa195212e91b93a925c753028dd15a83147c810d64dd07ce84 +DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7 +EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466 +EBUILD vkd3d-1.1.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466 +EBUILD vkd3d-9999.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466 MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71 diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild b/app-emulation/vkd3d/vkd3d-1.0.ebuild index 2adf5f15608b..adf1fb7481d8 100644 --- a/app-emulation/vkd3d/vkd3d-1.0.ebuild +++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,10 +22,7 @@ RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND} dev-util/spirv-headers - || ( - dev-util/vulkan-headers - <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] - )" + dev-util/vulkan-headers" DESCRIPTION="D3D12 to Vulkan translation library" HOMEPAGE="https://source.winehq.org/git/vkd3d.git/" diff --git a/app-emulation/vkd3d/vkd3d-1.1.ebuild b/app-emulation/vkd3d/vkd3d-1.1.ebuild new file mode 100644 index 000000000000..adf1fb7481d8 --- /dev/null +++ b/app-emulation/vkd3d/vkd3d-1.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib-minimal + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz" +fi + +IUSE="spirv-tools" +RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) + media-libs/vulkan-loader[${MULTILIB_USEDEP},X] + x11-libs/xcb-util:=[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}] + x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]" + +DEPEND="${RDEPEND} + dev-util/spirv-headers + dev-util/vulkan-headers" + +DESCRIPTION="D3D12 to Vulkan translation library" +HOMEPAGE="https://source.winehq.org/git/vkd3d.git/" + +LICENSE="LGPL-2.1" +SLOT="0" + +multilib_src_configure() { + local myconf=( + $(use_with spirv-tools) + ) + + ECONF_SOURCE=${S} econf "${myconf[@]}" +} diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild index 2adf5f15608b..adf1fb7481d8 100644 --- a/app-emulation/vkd3d/vkd3d-9999.ebuild +++ b/app-emulation/vkd3d/vkd3d-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,10 +22,7 @@ RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND} dev-util/spirv-headers - || ( - dev-util/vulkan-headers - <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] - )" + dev-util/vulkan-headers" DESCRIPTION="D3D12 to Vulkan translation library" HOMEPAGE="https://source.winehq.org/git/vkd3d.git/" -- cgit v1.2.3