From nobody Thu Feb 15 00:59:51 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 4TZxYM613tz552rJ; Thu, 15 Feb 2024 00:59:51 +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 4TZxYM5C9Tz4bVW; Thu, 15 Feb 2024 00:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707958791; 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=+uPVwou+nIQFNql5C2gww1rQlAZ37D5ujwy31DEWs0g=; b=KaX5VXoNpkkWIgpGWpdPMRcJK3ylsA4IE/xF0uSBBewzIAGy/6jBglm61FAneejbQCqvsM K25SUxVy9imNAKbL8MiW69j3/kwGq2Ti8nX+0PFR14In0ScCSEezyQ3NWY4Er5QsXJxK2Z A0At0Zm7PxXDGWzkKTg13h0iNx0LWQK3MTRWt5CtLUzcu5dZio0gpbytwBm9vHQdEYVz0n JBNdEp/by2Upd4xn3UuGCoo9CfWt3RZjL9zoFpw/TmuLWD04jf1ehV5aXtiNsiOM5wnjG3 36+6WE743DdLuDVQcDq1ZiFrqG0Pg/WZclf5r1V7Ahxtzcmt0ZMjf7rvw/RmoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707958791; a=rsa-sha256; cv=none; b=H6ah9lvMpiYyoLcMawRmowhVQgoH9ll8WFTF5J7Qx/wilxtYVz86Xsazd3U2CuGONCIy99 j0/bfOjUpCdTe5BypdNcRaOQW5077F67uR2qipiwZSzPoThg4gLh/11EWC6TBRaa+ANEpa zpvvYa1jR5lTWUOfJYvgYYoeSCZm/wcZp+uUrlYM34GIo8EaEPMfsV0qaHS2pWjqwt0irs WSDnbU9THUkOhpiR20QsoM/7Q7C7I3XiFxS3XkOXqc432NHup37j4untd3FqZMe5eSpRqV uCsgY5dV545yHpLj1Y/oiVNAAY/ATbJQULd8QVnwMhCdoxm0fRRUOFTtC+Gsqg== 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=1707958791; 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=+uPVwou+nIQFNql5C2gww1rQlAZ37D5ujwy31DEWs0g=; b=UQT9BL82cHh8h+ZTXRCe/yRVZrc11XLfqic2HuXbNhWfdjQ8AzmK33eXe7KufzfQn3THU7 f27VsYWq1V1+Pt8Anx2T/c4OcZRsN0CVzQBjqD/x92yS/2GoW2FHQzSGyDad4f60af1iuI gU5T4btn6mf0zp+Jii7t2xwaC8Pc82Vmpc2KgeyO6wTNZvLw0yOybp5lcbvs8r8a9I5bIg s5Y1lscfJGM8di53yC0muiETonH5Nn115S1780psLgm3xKD+uvTyQT+LZNsDdAFxUlH0j7 1ndDtw4ocyM5DqlAzEpj5+pYDKnZPnHNHundObR+7GB38vdOhDlciOQY95ox9A== 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 4TZxYM4GDZzLkF; Thu, 15 Feb 2024 00:59:51 +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 41F0xpM1088753; Thu, 15 Feb 2024 00:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41F0xpuD088750; Thu, 15 Feb 2024 00:59:51 GMT (envelope-from git) Date: Thu, 15 Feb 2024 00:59:51 GMT Message-Id: <202402150059.41F0xpuD088750@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: b3e5282399eb - 2024Q1 - games/veloren-weekly: update to s20240214 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: 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/2024Q1 X-Git-Reftype: branch X-Git-Commit: b3e5282399eb68a484bb34c2377e5953b7968687 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3e5282399eb68a484bb34c2377e5953b7968687 commit b3e5282399eb68a484bb34c2377e5953b7968687 Author: Jan Beich AuthorDate: 2024-02-14 21:58:23 +0000 Commit: Jan Beich CommitDate: 2024-02-15 00:59:45 +0000 games/veloren-weekly: update to s20240214 Changes: https://gitlab.com/veloren/veloren/-/compare/f159dd535...5c4e68cce (cherry picked from commit 1ab35236f75037b806db9bfe7b99aad9fe1cffc0) --- games/veloren-weekly/Makefile | 4 ++-- games/veloren-weekly/distinfo | 6 +++--- games/veloren-weekly/files/patch-unix | 40 +++++++++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index 0d6e7976ec9f..d259d2f8f2b2 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,5 +1,5 @@ PORTNAME= veloren -PORTVERSION= s20240211 +PORTVERSION= s20240214 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly @@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl USES= cargo xorg USE_XORG= xcb USE_GITLAB= yes -GL_TAGNAME= v0.15.0-1141-gf159dd535 # git describe --match='v[0-9]*' weekly +GL_TAGNAME= v0.15.0-1160-g5c4e68cce # git describe --match='v[0-9]*' weekly CARGO_ENV= VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib" PLIST_FILES= bin/${PORTNAME}-server-cli \ bin/${PORTNAME}-voxygen \ diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo index ee5785d065c0..a17449a84ca7 100644 --- a/games/veloren-weekly/distinfo +++ b/games/veloren-weekly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1707681816 +TIMESTAMP = 1707953009 SHA256 (rust/crates/ab_glyph-0.2.23.crate) = 80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225 SIZE (rust/crates/ab_glyph-0.2.23.crate) = 18537 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046 @@ -1617,5 +1617,5 @@ SHA256 (IsseW-wgpu-5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0_GH0.tar.gz) = 65b2e7 SIZE (IsseW-wgpu-5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0_GH0.tar.gz) = 9995366 SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210 -SHA256 (veloren-v0.15.0-1141-gf159dd535.tar.bz2) = c1fd8c12754d787aa1d86da7778c1c3ca42950f3f17ececfefa05e433662c597 -SIZE (veloren-v0.15.0-1141-gf159dd535.tar.bz2) = 290587691 +SHA256 (veloren-v0.15.0-1160-g5c4e68cce.tar.bz2) = 51aa543152cb711d062d0718945423ae541515c23efd6d48fe722a64cc548257 +SIZE (veloren-v0.15.0-1160-g5c4e68cce.tar.bz2) = 290606883 diff --git a/games/veloren-weekly/files/patch-unix b/games/veloren-weekly/files/patch-unix index cfcc77aa4d91..732a4f05a035 100644 --- a/games/veloren-weekly/files/patch-unix +++ b/games/veloren-weekly/files/patch-unix @@ -1,16 +1,44 @@ Relax Linux checks for the code works on any non-Windows platform. ---- server-cli/src/main.rs.orig 2024-01-31 15:30:47 UTC +--- server-cli/src/main.rs.orig 2024-02-14 21:58:23 UTC +++ server-cli/src/main.rs -@@ -57,7 +57,7 @@ fn main() -> io::Result<()> { - - let sigusr1_signal = Arc::new(AtomicBool::new(false)); +@@ -66,14 +66,14 @@ fn main() -> io::Result<()> { + // Load settings + let settings = settings::Settings::load(); - #[cfg(any(target_os = "linux", target_os = "macos"))] + #[cfg(not(target_os = "windows"))] - let _ = signal_hook::flag::register(signal_hook::consts::SIGUSR1, Arc::clone(&sigusr1_signal)); + { + for signal in &settings.shutdown_signals { + let _ = signal_hook::flag::register(signal.to_signal(), Arc::clone(&shutdown_signal)); + } + } + +- #[cfg(not(any(target_os = "linux", target_os = "macos")))] ++ #[cfg(target_os = "windows")] + if !settings.shutdown_signals.is_empty() { + tracing::warn!( + "Server configuration contains shutdown signals, but your platform does not support \ +--- server-cli/src/settings.rs.orig 2024-02-14 21:58:23 UTC ++++ server-cli/src/settings.rs +@@ -15,7 +15,7 @@ impl ShutdownSignal { + } - let (_guards, _guards2) = if basic { + impl ShutdownSignal { +- #[cfg(any(target_os = "linux", target_os = "macos"))] ++ #[cfg(not(target_os = "windows"))] + pub fn to_signal(self) -> core::ffi::c_int { + match self { + Self::SIGUSR1 => signal_hook::consts::SIGUSR1, +@@ -44,7 +44,7 @@ impl Default for Settings { + update_shutdown_message: "The server is restarting for an update".to_owned(), + web_address: SocketAddr::from((Ipv4Addr::LOCALHOST, 14005)), + web_chat_secret: None, +- shutdown_signals: if cfg!(any(target_os = "linux", target_os = "macos")) { ++ shutdown_signals: if cfg!(not(target_os = "windows")) { + vec![ShutdownSignal::SIGUSR1] + } else { + Vec::new() --- voxygen/src/main.rs.orig 2024-02-07 19:13:27 UTC +++ voxygen/src/main.rs @@ -51,7 +51,7 @@ fn main() {