From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1588742-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3A34B158451
for <garchives@archives.gentoo.org>; Mon, 8 Jan 2024 21:48:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 74A7AE2B8B;
Mon, 8 Jan 2024 21:48:10 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4805BE2B8B
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2024 21:48:10 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2514E34322D
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2024 21:48:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BC6E141
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2024 21:48:07 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org>
Message-ID: <1704749704.2bbf5db6fe135a9e0b51b3cd8f62f487fe8efd3b.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/wine-proton/wine-proton-8.0.4.ebuild app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
X-VCS-Directories: app-emulation/wine-proton/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: 2bbf5db6fe135a9e0b51b3cd8f62f487fe8efd3b
X-VCS-Branch: master
Date: Mon, 8 Jan 2024 21:48:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1e64e89c-5c65-471c-aa53-56b680e58355
X-Archives-Hash: 096350e8f69b0a4612fb0e77d413b694
commit: 2bbf5db6fe135a9e0b51b3cd8f62f487fe8efd3b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 21:28:25 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 21:35:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbf5db6
app-emulation/wine-proton: use -latomic for winevulkan with clang
Seems newly needed on top of ntdll and missed that.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/wine-proton/wine-proton-8.0.4.ebuild | 5 +++--
app-emulation/wine-proton/wine-proton-8.0.9999.ebuild | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
index cc16907c46de..be98e0d28d22 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -158,7 +158,8 @@ src_prepare() {
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
# needed by Valve's fsync patches if using clang (undef atomic_load_8)
- sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in || die
+ sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
+ -i dlls/{ntdll,winevulkan}/Makefile.in || die
fi
# ensure .desktop calls this variant + slot
diff --git a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
index 0ee683445ce9..a515a28f2122 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
@@ -159,7 +159,8 @@ src_prepare() {
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
# needed by Valve's fsync patches if using clang (undef atomic_load_8)
- sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in || die
+ sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
+ -i dlls/{ntdll,winevulkan}/Makefile.in || die
fi
# ensure .desktop calls this variant + slot