From nobody Fri May 10 01:19:47 2024 X-Original-To: dev-commits-ports-all@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 4Vb9z81MdXz5KT2X; Fri, 10 May 2024 01:19:48 +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 4Vb9z80lYWz4Lly; Fri, 10 May 2024 01:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715303988; 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=sTv/DanMT+YElo37csKFbQBsMbCNRPmhAIt69q4Rf1Y=; b=qAzEp1D6KLusFZd+gBLiisD/wK39+Gp8Z7iWqWxuUHKoRospwWdUz1ofMYrNOMkiCHaelC /Hsd420v6FiQMHcIxlbpISqLTssSliDY4TbbkNd0wi194sjybozdazzXzGd3fR2zFF7MAy /6bzeBcYFWZcNo+kz51/hTDD+iX7D2SctU8iBPKTFmyXiMBLU59cQbgmq6k0KSI/y2DHmu ijjdjMTZAyp9FHhRP0sk8rEm36SLHp7hvlaJCoV5WuaFW13azKEsTsZPeNiRfupPr6J0LL nwRq8zxz+hK/6bTzcVFJ0SqZ4TkHi14vwbenAjljW8cAWXrtP3xzaVnV8xbM7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715303988; a=rsa-sha256; cv=none; b=eZENe2toyTgO+egF7J3e6g+Fnxy2F3M7JmygM9tbEaJLTmt3JmjFkagTcu82ZL8lLa6niz iRBa1RMMxXuMX966VHUen8aqFh9s6LcC0efhN/jieY+WdjnCSLQsFJSNE0lV3YXTq/YyHt 0KDxhlIEAYhKf5luQfiKhc2XR/RPa0HCfRUEIzbgXgXsKBVHJ8LF6kTFPE6zmXUASrxbsg AVEXdH8q8sPeA4eeRyKXu1k3E0uDXHjZvdwwL/OTaxmsGMsT76O6HBw+lXtYh0CmoAaPfS RGqgpe18gO76LGFMsJgHTJooVpwDvj8tyspOCS1ctC+l/pLdOoou1LNkfst6UA== 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=1715303988; 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=sTv/DanMT+YElo37csKFbQBsMbCNRPmhAIt69q4Rf1Y=; b=L3mtdWs9AMueiBP5A6Wn8xzebUN9+xHWfNUw4kFYoNXuwK09+fhSLtqTAW9qY6sqUxqRfd nIajxGdgd8HzHmoDmM8RT4sIwSY1hwtOd4jzNP+KMb0x883DHR01gts7H+pblpQUJk+jO9 Mipg57OTQab9HTtFaX1p0DRRpUsQ3zLdhU2I8TjG14ozzijxSxaVW8wJoIDgcpHHcICq00 UbIZhMQZ0hBQBblcMDd7w4LuR4QKBMpewFXvEGF7zraULkKCOX4/mK6yXOn15YRLpJRNfN oPBs1R05iqstdnS13qNohEOSzjI7KeJODrHKe/DQImr4z9MjmMVonLZ8P0+Vhg== 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 4Vb9z80G29zH16; Fri, 10 May 2024 01:19:48 +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 44A1Jl44050557; Fri, 10 May 2024 01:19:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44A1JlPe050554; Fri, 10 May 2024 01:19:47 GMT (envelope-from git) Date: Fri, 10 May 2024 01:19:47 GMT Message-Id: <202405100119.44A1JlPe050554@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: cd234304ece4 - main - games/veloren-weekly: unbreak key name translation List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: cd234304ece4e9df995bcfe6b4ed32c4e08fcfaa Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd234304ece4e9df995bcfe6b4ed32c4e08fcfaa commit cd234304ece4e9df995bcfe6b4ed32c4e08fcfaa Author: Jan Beich AuthorDate: 2024-05-09 23:19:49 +0000 Commit: Jan Beich CommitDate: 2024-05-10 01:19:12 +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 --- 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;