public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vkd3d-proton/
Date: Fri, 17 Nov 2023 05:14:09 +0000 (UTC)	[thread overview]
Message-ID: <1700198022.c4e8357dc253dc1de4e3116e919c26ee13fc1fc3.ionen@gentoo> (raw)

commit:     c4e8357dc253dc1de4e3116e919c26ee13fc1fc3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 05:11:56 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 05:13:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e8357d

app-emulation/vkd3d-proton: update live

wrt static, these are now passed unconditionally for windows platform.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
index 490163e3132b..573700be0e89 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_SUBMODULES=(
 		# uses hacks / recent features and easily breaks, keep bundled headers
 		# (also cross-compiled and -I/usr/include is troublesome)
-		subprojects/{SPIRV,Vulkan}-Headers
+		khronos/{SPIRV,Vulkan}-Headers
 		subprojects/dxil-spirv
 		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
 	)
@@ -85,15 +85,13 @@ src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die
 		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
-		mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die
-		mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die
+		mv ../SPIRV-Headers-${HASH_SPIRV} khronos/SPIRV-Headers || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} khronos/Vulkan-Headers || die
 
 		# dxil and vkd3d's spirv headers currently mismatch and incompatible
 		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
 		mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
 			subprojects/dxil-spirv/third_party/spirv-headers || die
-#		ln -s ../../../SPIRV-Headers/include \
-#			subprojects/dxil-spirv/third_party/spirv-headers || die
 	fi
 
 	default
@@ -133,10 +131,6 @@ src_configure() {
 		CHOST_x86=i686-w64-mingw32
 		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
 
-		# preferring meson eclass' cross file over upstream's but, unlike
-		# dxvk, we lose static options in the process (from build-win*.txt)
-		append-ldflags -static -static-libgcc -static-libstdc++
-
 		strip-unsupported-flags
 	fi
 


             reply	other threads:[~2023-11-17  5:14 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-17  5:14 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-09 14:41 [gentoo-commits] repo/gentoo:master commit in: app-emulation/vkd3d-proton/ Ionen Wolkens
2025-02-14  8:00 Ionen Wolkens
2025-01-24  7:43 Ionen Wolkens
2025-01-20  9:49 Arthur Zamarin
2025-01-20  9:49 Arthur Zamarin
2025-01-10 21:38 Ionen Wolkens
2025-01-02 14:15 Sam James
2025-01-02 14:05 Sam James
2024-12-13 15:15 Ionen Wolkens
2024-11-14  1:49 Sam James
2024-11-13 12:42 Sam James
2024-06-21 17:00 Ionen Wolkens
2024-05-22  3:32 Ionen Wolkens
2024-05-21  3:01 Ionen Wolkens
2024-05-07 14:28 Ionen Wolkens
2024-04-25 20:40 Sam James
2024-04-25 20:40 Sam James
2024-03-28 10:10 Ionen Wolkens
2024-03-27 16:45 Ionen Wolkens
2024-03-24 18:39 Ionen Wolkens
2024-03-15 20:12 Ionen Wolkens
2024-03-15 20:12 Ionen Wolkens
2024-01-05  5:19 Arthur Zamarin
2024-01-05  5:19 Arthur Zamarin
2023-12-15 16:09 Ionen Wolkens
2023-12-15 16:09 Ionen Wolkens
2023-12-15 10:10 Michał Górny
2023-12-14 21:46 Sam James
2023-11-24 17:01 Ionen Wolkens
2023-11-24 17:01 Ionen Wolkens
2023-10-01 18:07 Arthur Zamarin
2023-10-01 18:07 Arthur Zamarin
2023-09-11 14:59 Ionen Wolkens
2023-08-15 20:22 Ionen Wolkens
2023-08-10 10:53 Ionen Wolkens
2023-06-26 10:12 Ionen Wolkens
2023-06-08 12:24 Arthur Zamarin
2023-06-08 12:23 Arthur Zamarin
2023-06-02  6:54 Ionen Wolkens
2023-05-20  2:01 Ionen Wolkens
2023-05-20  1:52 Ionen Wolkens
2023-05-20  1:52 Ionen Wolkens
2023-05-20  1:52 Ionen Wolkens
2023-05-12 11:59 Ionen Wolkens
2023-05-12 11:59 Ionen Wolkens
2023-04-29  9:43 Ionen Wolkens
2023-04-17 20:44 Ionen Wolkens
2022-12-29 20:29 Ionen Wolkens
2022-12-19  7:23 Ionen Wolkens
2022-12-15 21:32 Ionen Wolkens
2022-12-15 21:23 Ionen Wolkens
2022-12-02  3:18 Ionen Wolkens
2022-12-02  3:18 Ionen Wolkens
2022-12-02  3:18 Ionen Wolkens
2022-11-29 11:44 Ionen Wolkens
2022-11-10 23:50 Ionen Wolkens
2022-10-31  0:54 Ionen Wolkens
2022-10-27 19:20 Ionen Wolkens
2022-10-27 19:20 Ionen Wolkens
2022-10-23  7:20 Ionen Wolkens
2022-09-14 23:11 Ionen Wolkens
2022-07-16 17:03 Ionen Wolkens
2022-06-28  7:46 Ionen Wolkens
2022-05-14  2:23 Ionen Wolkens
2022-05-13  2:48 Ionen Wolkens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1700198022.c4e8357dc253dc1de4e3116e919c26ee13fc1fc3.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox