From nobody Fri May 10 01:20:09 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vb9zZ00qnz5KT5Q; Fri, 10 May 2024 01:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vb9zY6WYKz4Lvr; Fri, 10 May 2024 01:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715304009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfIiBUnkOC9c7RnQ4L3ayuJpMdqxGZfw0Dd5wqaQ3pc=; b=BVuPGCi00W0LhhjmP99qt3BB8frs8P66UhqyqGTx2cPyv/eJDw16urxu/UYfZYK870e60B jm0JTWdd6I+0QhXoVgKeb5XE5SBLvBSsF0f9Y+S2qagEC/cPJ7O70lnpYNNN0K4/Rpp7eB eeB5IFz38ekqSCWRA2UB9aQNnw1p8xDUh0s3UVgwTcznB0MuIM87xwdNouTrr823DIy/Xh APcMAo6nB5LhuysZZTyRuGevaCSNoV1TfZN1Nxwm+LCoYQDRVvwyMeltwIwEe4nb5xCp56 el62h1tQQRFak91xg+13JdnND/IfAcsUFV54dt6+hyL0M/XXlsqLTKLIzfifAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715304009; a=rsa-sha256; cv=none; b=kGpLhnm6AKKI+6VLUXIMyDAddE2OSS+Yrb5HYA9odj9lNoN6pfEPsqJjDtVNknhX6b1D78 Rl/JQU41btjhORQoWX+lvCr+EHwPp/LkKth5Dy36yur6QLT7G2GvwfglHZhrvH4SP0gT1C TC11Ld1qmVgKSrYhUG3OZ0rnL91tYVjk6IS6uESoLIyJZj4Nrhco/1HO5KPjhqk2n6yVha oV4z6iluZuewFLCeQub4PXel5SJ8ZXkc/sqoiAqZEZA80OuR3gJLLl0rmsrR3PMygObGMZ jgoCVB/Cy6DH5CGhQ5GgjdeKHglN9Xm2Yz+lqfL/j/nauedQeBdBWOFPpkUXLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715304009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfIiBUnkOC9c7RnQ4L3ayuJpMdqxGZfw0Dd5wqaQ3pc=; b=scKbdU0KwxAK4JVgGPeXOSZVT1WcdKsYjZE0wbXjx6daLP0PtAUOYxnhcHemrjJd5vrWLY YUW9tW8Mob6rBZX54tz9ho6L4iOmJ/3vGd3H5hxg0Urkxi4Qx7EfgDwjzA5CyChOVXuat+ NJxQFcbK37v+lbRbq1Cbwq0QmK3E0bjTsXooLysgmBjBIQSryfINm5OrdJfYYr2IH2IC5D wVpDsGzfHm1aP+XhdAcoM5NNcafPwvKg6gpmGWd7CSCfk8V6itYMEVOCoepEZYVDTd+s/D hvvV89kToUSB+eHTaUxx2iUUWL+jvccFlcKLFM3m8aY7LboNkjxJz0FK6TDzWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vb9zY6524zGWv; Fri, 10 May 2024 01:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44A1K9Eb054582; Fri, 10 May 2024 01:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44A1K9XO054577; Fri, 10 May 2024 01:20:09 GMT (envelope-from git) Date: Fri, 10 May 2024 01:20:09 GMT Message-Id: <202405100120.44A1K9XO054577@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 1f2d45aed7f2 - 2024Q2 - games/veloren-weekly: unbreak key name translation List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 1f2d45aed7f27fee562151b2c2f5401dabe282fa Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f2d45aed7f27fee562151b2c2f5401dabe282fa commit 1f2d45aed7f27fee562151b2c2f5401dabe282fa Author: Jan Beich AuthorDate: 2024-05-09 23:19:49 +0000 Commit: Jan Beich CommitDate: 2024-05-10 01:20:02 +0000 games/veloren-weekly: unbreak key name translation WARN veloren_voxygen::window: Failed to construct the scancode to keyname mapper, falling back to displaying Unknown(). err=PlatformUnsupportedError https://gitlab.com/veloren/veloren/-/commit/0d7d069d4149 (cherry picked from commit cd234304ece4e9df995bcfe6b4ed32c4e08fcfaa) --- games/veloren-weekly/Makefile | 4 ++- games/veloren-weekly/files/patch-keyboard-keynames | 41 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index b0c02ae3391f..576eaffb3bd0 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,5 +1,6 @@ PORTNAME= veloren PORTVERSION= s20240509 +PORTREVISION= 1 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly @@ -18,7 +19,8 @@ ONLY_FOR_ARCHS_REASON= unsupported platform by https://github.com/wasmerio/wasme LIB_DEPENDS= libzstd.so:archivers/zstd \ libasound.so:audio/alsa-lib \ libudev.so:devel/libudev-devd \ - libshaderc_shared.so:graphics/shaderc + libshaderc_shared.so:graphics/shaderc \ + libxkbcommon-x11.so:x11/libxkbcommon RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader diff --git a/games/veloren-weekly/files/patch-keyboard-keynames b/games/veloren-weekly/files/patch-keyboard-keynames new file mode 100644 index 000000000000..10f126ce6f72 --- /dev/null +++ b/games/veloren-weekly/files/patch-keyboard-keynames @@ -0,0 +1,41 @@ +Assume X11/Wayland key names on every Unix-like system + +--- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/Cargo.toml.orig 2023-08-23 04:01:46 UTC ++++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/Cargo.toml +@@ -18,7 +18,7 @@ winapi = { version = "0.3.9", features = ["winuser"] } + [target.'cfg(windows)'.dependencies] + winapi = { version = "0.3.9", features = ["winuser"] } + +-[target.'cfg(target_os = "linux")'.dependencies] ++[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies] + xkbcommon = { version = "0.5", features = ["x11", "wayland"] } + xcb = { version = "1", features = ["as-raw-xcb-connection"] } + wayland-client = "0.29" +--- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/mod.rs.orig 2023-08-23 04:01:46 UTC ++++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/mod.rs +@@ -1,5 +1,5 @@ + //! The KeyLayout struct and supporting elements +-#[cfg(target_os = "linux")] ++#[cfg(all(unix, not(target_os = "macos")))] + #[path = "unix/mod.rs"] + mod platform; + +@@ -7,7 +7,7 @@ mod platform; + #[path = "windows/mod.rs"] + mod platform; + +-#[cfg(not(any(target_os = "windows", target_os = "linux")))] ++#[cfg(target_os = "macos")] + #[path = "other/mod.rs"] + mod platform; + +--- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/unix/key_layout.rs.orig 2023-08-23 04:01:46 UTC ++++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/unix/key_layout.rs +@@ -220,7 +220,6 @@ impl KeyLayout { + } + + /// Methods for KeyLayout specific to Unix-based systems +-#[cfg(target_os = "linux")] + pub trait KeyLayoutExtUnix { + /// Construct a KeyLayout explicitly using the Wayland protocol + fn new_wayland() -> Result;