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

2023-09-21 Thread Ionen Wolkens 
commit: 5a99343091d086a5e77b4be6777f8b2e2ddfd236
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 22 05:05:17 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep 22 05:55:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a993430

app-emulation/vkd3d: add 1.9

Also do a dirty fix for implicit configure check, not going to
spend much time here given this is only packaged for old wine-7.

May eventually mask USE=vkd3d on it rather than keep updating this
given it is unlikely dx12-users are not using a more recent Wine
and it is questionable how compatible these bumps are.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vkd3d/Manifest   |  1 +
 .../vkd3d/files/vkd3d-1.9-implicit-gettid.patch|  8 
 app-emulation/vkd3d/vkd3d-1.9.ebuild   | 51 ++
 3 files changed, 60 insertions(+)

diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index e7e6d59c4253..d26e7801100b 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1 +1,2 @@
 DIST vkd3d-1.8.tar.xz 829648 BLAKE2B 
0e7bb53e3eb9003ea76ee523dfa317b6ab95fd1c2decb453d650f0cf046d5b802a32e40c4e6f6464748903143ef9352e70fdf8ca7fa8e9b9909e0f15235d2b01
 SHA512 
43d65bf4aa60750e08653226197f40c97bc88d56dc5513b70182b5fe289ab56a225682c96400776cd625ad5a8f76644bf4b46bd3ed54aa8496f538f6854d680a
+DIST vkd3d-1.9.tar.xz 902300 BLAKE2B 
62c71b98912e66d86a2d2d934f6bd4c252cced68d3ad96c23b7404dbe346e7a11e43affb1959b389cfc90b53f32b2011ceeca6d066bcae876d24ff0822719d2b
 SHA512 
7fe931fca4bc2e13bd59f2068d758581797aa15530fb811d71323e3cd83a0f12ec3a00e2951f38033fccf8eabfca45e06dad79d80ccc164e047e13cbfc960d0e

diff --git a/app-emulation/vkd3d/files/vkd3d-1.9-implicit-gettid.patch 
b/app-emulation/vkd3d/files/vkd3d-1.9-implicit-gettid.patch
new file mode 100644
index ..5aea3171c2de
--- /dev/null
+++ b/app-emulation/vkd3d/files/vkd3d-1.9-implicit-gettid.patch
@@ -0,0 +1,8 @@
+Dirty quick fix for implicit function check, VKD3D_CHECK_FUNC ideally
+needs to be adjusted to be able to pass headers.
+--- a/configure
 b/configure
+@@ -18656,2 +18656,3 @@
+ /* end confdefs.h.  */
++#include 
+ int main(void) { return gettid(); }

diff --git a/app-emulation/vkd3d/vkd3d-1.9.ebuild 
b/app-emulation/vkd3d/vkd3d-1.9.ebuild
new file mode 100644
index ..2056245ceba0
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://gitlab.winehq.org/wine/vkd3d/;
+SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ncurses spirv-tools"
+RESTRICT="test" #838655
+
+RDEPEND="
+   media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+   ncurses? ( sys-libs/ncurses:= )
+   spirv-tools? ( dev-util/spirv-tools[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+   ${RDEPEND}
+   dev-util/spirv-headers
+   dev-util/vulkan-headers
+"
+BDEPEND="
+   sys-devel/flex
+   sys-devel/bison
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.9-implicit-gettid.patch
+)
+
+multilib_src_configure() {
+   local conf=(
+   $(multilib_native_use_with ncurses)
+   $(use_with spirv-tools)
+   --disable-doxygen-pdf
+   --without-xcb
+   )
+
+   ECONF_SOURCE=${S} econf "${conf[@]}"
+}
+
+multilib_src_install_all() {
+   find "${ED}" -type f -name '*.la' -delete || die
+}

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

2022-09-17 Thread Ionen Wolkens 
commit: 64c6d3ec4423ac720e5b465645c144ff8d4f5eec
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep 17 06:43:04 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Sep 17 08:42:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c6d3ec

app-emulation/vkd3d: drop 1.0, 1.1, 1.1-r1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vkd3d/Manifest   |  2 -
 .../vkd3d/files/vkd3d-1.1-Fix-build.patch  | 22 ---
 app-emulation/vkd3d/vkd3d-1.0.ebuild   | 39 
 app-emulation/vkd3d/vkd3d-1.1-r1.ebuild| 43 --
 app-emulation/vkd3d/vkd3d-1.1.ebuild   | 39 
 5 files changed, 145 deletions(-)

diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index a68ffed16fbf..d2e616a195ea 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1,4 +1,2 @@
-DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 
4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33
 SHA512 
55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
-DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 
834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d
 SHA512 
e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
 DIST vkd3d-1.2.tar.xz 611240 BLAKE2B 
e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e7c359c4bfbd8c259f092e041a75a0e896da9a1c6370d5716590711128d31c9e552897b177b300b9a15107
 SHA512 
ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7
 DIST vkd3d-1.4.tar.xz 774920 BLAKE2B 
c46a71b495fc41658ea493f65ad15aec18202889a9c7925962301cce91f32e197c5850f374331595e4bd267fcbf9836531e733fb5880ddb4936476ddedd19bbc
 SHA512 
58535b57b0b506542f2867e9b1229682f012216b9f8913d2692d4ed64a8113248d66ea710127ec2064baf9511b7f2be7b757dffcaf95a43168d781010d007ddb

diff --git a/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch 
b/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch
deleted file mode 100644
index 048c6c843f55..
--- a/app-emulation/vkd3d/files/vkd3d-1.1-Fix-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
-index df7..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.0.ebuild 
b/app-emulation/vkd3d/vkd3d-1.0.ebuild
deleted file mode 100644
index adf1fb7481d8..
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ "${PV}" == "" ]]; 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-1.1-r1.ebuild 
b/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
deleted file mode 100644
index 2fc70a042f61..
--- a/app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ "${PV}" == "" ]]; then
-