[gentoo-commits] repo/gentoo:master commit in: app-emulation/vkd3d/files/, app-emulation/vkd3d/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vkd3d/files/, app-emulation/vkd3d/

[Nick Sarnie]

commit:     496be1555f6cbcf13663d796a9403674774fc4ff
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 23:58:11 2020 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 23:59:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496be155

app-emulation/vkd3d: Fix build

Closes: https://bugs.gentoo.org/show_bug.cgi?id=728094
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../vkd3d/files/vkd3d-1.1-Fix-build.patch          | 22 +++++++++++
 app-emulation/vkd3d/vkd3d-1.1-r1.ebuild            | 43 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch b/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch
new file mode 100644
index 00000000000..048c6c843f5
--- /dev/null
+++ b/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch
@@ -0,0 +1,22 @@
+diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
+index df44447..53a081a 100644
+--- a/libs/vkd3d/vkd3d_private.h
++++ b/libs/vkd3d/vkd3d_private.h
+@@ -47,6 +47,8 @@
+ 
+ #define VKD3D_MAX_SHADER_STAGES     5u
+ 
++#define VKD3D_PIPELINE_BIND_POINT_COUNT 2u
++
+ struct d3d12_command_list;
+ struct d3d12_device;
+ 
+@@ -625,7 +627,7 @@ struct d3d12_command_list
+     VkFramebuffer current_framebuffer;
+     VkPipeline current_pipeline;
+     VkRenderPass current_render_pass;
+-    struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
++    struct vkd3d_pipeline_bindings pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COUNT];
+ 
+     struct d3d12_pipeline_state *state;
+ 

diff --git a/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild b/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
new file mode 100644
index 00000000000..1c952142c43
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 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 ~x86"
+	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"
+
+PATCHES=(
+        "${FILESDIR}"/${P}-Fix-build.patch
+)
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_with spirv-tools)
+	)
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}