From nobody Thu Sep 07 00:31:46 2023 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 4Rh0YG6BTlz4smTj; Thu, 7 Sep 2023 00:31:46 +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 4Rh0YG5Cfvz4qVB; Thu, 7 Sep 2023 00:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694046706; 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=KlKX0IMmspfw6wWCgNvq+jR7jdaVr4wsKlKZfdMzlSE=; b=QdszoE16E116Xt2v7NxlWp9ZVd5d/w0JrgX3pe8P6J7eGeO4dhjAsFol3hU2joHXSNf3W0 pkwi9c3qjvDMPp4/xpMJQHMmJpvNMJusK2AfTsVO9sorsLHwmsq1cIL+OnE5cbJg/VVb2R wjyWf4j1XrBwYErKm8t/Z+MSpcVY6bY10iZxZCM2r2p8ap/ZosRGFM2/urRDcB4hSa3tAA 0+y6OO0LxJw9ujAxKsfNjHkQxo5bJ/HpiOlXITO0sV0WER32Ty4L01Zc8gZoIT7c7ZSBsY Yd7XxzszC+RYvX2xq0K+/dtHk/nuqgn6G73T689dUbnHhNrqI1ibzb+vzowoQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694046706; a=rsa-sha256; cv=none; b=UUR0jNrNgjvwBRwleqm3VmQ/ITbCsOO3aW/i0gUzSRy+quBvVHX/HZcuisTplHDWddaq/G uol+yUIjt8GGI2fSYMqLTvBGofKzndbaWBn+dU92oP2d+t6rtXAmfPeiOfeUIgXI6C4lQY 5aGQaM2gime/xv+fATvTe1NJo26St5m2Ptf5sqD7g/XH5wI6S5r/CE/VgZHYykCIvaFGCC +Pz9b5BZTaBZOvmPklvw8gm/GL94c170gVPma4rgXLs0tT4NNQQLvKzTL/4TQkT2/f1wYK dpvzDErilnixVpatBsiQng+yI5tJZiNsO0OpjpWEen3plpv4CYuyQF5Otys/Fg== 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=1694046706; 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=KlKX0IMmspfw6wWCgNvq+jR7jdaVr4wsKlKZfdMzlSE=; b=kxRCJ7ZpGfuNGxVIz7rRCcrnVTB17caDMK/uxIVg5Zsvf2fVyiRo+YnFJBGRLdYxFcgtMQ q+MBOYVDnDZyOUv1JYsUxjwa3hjjMl8vhat2iCemejnQqHPVT6eJZfC9+svoqgkubWk0Iw CKQB5CSwWVNGiJ6Xhu9+rAvuNcPTXHDb5P1ziRtXXRfCdXt57eotoCb4nfBCpvrg++GAe2 xJWozwXjdE5Az2U35OfTcSM5XEftj6LXiJ/qpffiCjQpYmIXw0maPSQ2xxzYmeN5na8QOB jbzMLetKXMSju/jK++oinlL/DCKgRXFddFTXVtoTso/cFZqSfjC59epJb1mqHQ== 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 4Rh0YG4G6Qzd3X; Thu, 7 Sep 2023 00:31:46 +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 3870VkuH085736; Thu, 7 Sep 2023 00:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3870VkUO085733; Thu, 7 Sep 2023 00:31:46 GMT (envelope-from git) Date: Thu, 7 Sep 2023 00:31:46 GMT Message-Id: <202309070031.3870VkUO085733@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: 6b3e4babafb2 - 2023Q3 - games/veloren-weekly: update to s20230901 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 6b3e4babafb2019ea054d187704f9a859bcc358c Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b3e4babafb2019ea054d187704f9a859bcc358c commit 6b3e4babafb2019ea054d187704f9a859bcc358c Author: Jan Beich AuthorDate: 2023-09-01 18:14:24 +0000 Commit: Jan Beich CommitDate: 2023-09-07 00:31:34 +0000 games/veloren-weekly: update to s20230901 Changes: https://gitlab.com/veloren/veloren/-/compare/78b2443ed...19742bb93 (cherry picked from commit c57cfd0f4229d649ae9447fbcfcfaef518da638d) --- games/veloren-weekly/Makefile | 4 ++-- games/veloren-weekly/distinfo | 6 +++--- games/veloren-weekly/files/patch-gilrs | 2 +- games/veloren-weekly/files/patch-i386 | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index c09f33367b29..dd71b4a5be04 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,5 +1,5 @@ PORTNAME= veloren -PORTVERSION= s20230830 +PORTVERSION= s20230901 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly @@ -24,7 +24,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_COMMIT= 78b2443edc4bf09ff3dc6e8cad7b7a3887ef584e +GL_COMMIT= 19742bb9300fb0be9fdc92f30766c95230a8a371 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 ab8583701cfd..f3deec929a71 100644 --- a/games/veloren-weekly/distinfo +++ b/games/veloren-weekly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1693397332 +TIMESTAMP = 1693592064 SHA256 (rust/crates/ab_glyph-0.2.21.crate) = 5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39 SIZE (rust/crates/ab_glyph-0.2.21.crate) = 17764 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046 @@ -1535,5 +1535,5 @@ SHA256 (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = f6fc0 SIZE (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = 90485 SHA256 (Imberflur-winit-raw-window-handle-0.4-retro-support-v1_GH0.tar.gz) = 55b7e0bfdf87aca662e4ae0a8abd4cbe0cf5d2d2e9f9a61f8b40f02ab769d04f SIZE (Imberflur-winit-raw-window-handle-0.4-retro-support-v1_GH0.tar.gz) = 402612 -SHA256 (veloren-veloren-78b2443edc4bf09ff3dc6e8cad7b7a3887ef584e_GL0.tar.gz) = 6de40aec5643bff09407d75cc8e2aedb3ea284598eed20737f64bf7d9e313a79 -SIZE (veloren-veloren-78b2443edc4bf09ff3dc6e8cad7b7a3887ef584e_GL0.tar.gz) = 269734589 +SHA256 (veloren-veloren-19742bb9300fb0be9fdc92f30766c95230a8a371_GL0.tar.gz) = 9d5e9b1e7ad85467fc672483b05e0e787bc2e217aca42b19cad1d7ae7f33c420 +SIZE (veloren-veloren-19742bb9300fb0be9fdc92f30766c95230a8a371_GL0.tar.gz) = 269737005 diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs index a488f3438d1f..c92fe9ad3aa5 100644 --- a/games/veloren-weekly/files/patch-gilrs +++ b/games/veloren-weekly/files/patch-gilrs @@ -1,5 +1,5 @@ Temporarily revert https://gitlab.com/gilrs-project/gilrs/-/commit/7cd001dacfb1 -until https://github.com/nix-rust/nix/issues/2037 +until https://gitlab.com/gilrs-project/gilrs/-/issues/145 error[E0432]: unresolved import `nix::sys::epoll` --> cargo-crates/gilrs-core-0.5.5/src/platform/linux/gamepad.rs:21:15 diff --git a/games/veloren-weekly/files/patch-i386 b/games/veloren-weekly/files/patch-i386 index f9ccdf51a9c1..2dd39fcca4b6 100644 --- a/games/veloren-weekly/files/patch-i386 +++ b/games/veloren-weekly/files/patch-i386 @@ -1,3 +1,5 @@ +https://gitlab.com/veloren/veloren/-/merge_requests/4103 + error[E0308]: mismatched types --> rtsim/src/gen/mod.rs:30:43 |