sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

games/veloren-weekly: update to s20240207

Browse source 
Changes:	cbcf1965b...ac921c563
See also:	https://veloren.net/blog/devblog-226/
This commit is contained in:
Jan Beich 2024-02-07 20:13:27 +01:00
parent f70300fcd7
commit d82e7a41eb
10 changed files with 1167 additions and 976 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
games/veloren-weekly/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= veloren
PORTVERSION= s20240131
PORTVERSION= s20240207
CATEGORIES= games wayland
PKGNAMESUFFIX= -weekly
@ -23,7 +23,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-982-gcbcf1965b # git describe --match='v[0-9]*' weekly
GL_TAGNAME= v0.15.0-1095-gac921c563 # 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 \

613
games/veloren-weekly/Makefile.crates
View file

File diff suppressed because it is too large Load diff

1228
games/veloren-weekly/distinfo
View file

File diff suppressed because it is too large Load diff

156
games/veloren-weekly/files/patch-gilrs
View file

@ -23,6 +23,162 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
| | help: a similar name exists in the module: `event`
| no `epoll` in `sys`
--- Cargo.lock.orig 2024-02-07 19:13:27 UTC
+++ Cargo.lock
@@ -2407,9 +2407,9 @@ dependencies = [
[[package]]
name = "gilrs"
-version = "0.10.4"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b2e57a9cb946b5d04ae8638c5f554abb5a9f82c4c950fd5b1fee6d119592fb"
+checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a"
dependencies = [
"fnv",
"gilrs-core",
@@ -2421,24 +2421,23 @@ dependencies = [
[[package]]
name = "gilrs-core"
-version = "0.5.10"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0af1827b7dd2f36d740ae804c1b3ea0d64c12533fb61ff91883005143a0e8c5a"
+checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
dependencies = [
"core-foundation",
- "inotify 0.10.2",
"io-kit-sys",
"js-sys",
"libc",
"libudev-sys",
"log",
- "nix 0.27.1",
+ "nix 0.26.4",
"serde",
"uuid",
"vec_map",
"wasm-bindgen",
"web-sys",
- "windows 0.52.0",
+ "windows 0.51.1",
]
[[package]]
@@ -2918,7 +2917,7 @@ dependencies = [
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core",
]
[[package]]
@@ -3088,17 +3087,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "inotify"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
[[package]]
name = "inotify-sys"
version = "0.1.5"
@@ -3140,9 +3128,9 @@ dependencies = [
[[package]]
name = "io-kit-sys"
-version = "0.4.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4769cb30e5dcf1710fc6730d3e94f78c47723a014a567de385e113c737394640"
+checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de"
dependencies = [
"core-foundation-sys",
"mach2",
@@ -3916,6 +3904,17 @@ dependencies = [
"memoffset 0.6.5",
]
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
[[package]]
name = "nix"
version = "0.27.1"
@@ -3963,7 +3962,7 @@ dependencies = [
"crossbeam-channel",
"filetime",
"fsevent-sys",
- "inotify 0.9.6",
+ "inotify",
"kqueue",
"libc",
"log",
@@ -6785,7 +6784,7 @@ version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
"rand 0.8.5",
"static_assertions",
]
@@ -8234,20 +8233,10 @@ version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
dependencies = [
- "windows-core 0.51.1",
+ "windows-core",
"windows-targets 0.48.5",
]
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.0",
-]
-
[[package]]
name = "windows-core"
version = "0.51.1"
@@ -8257,15 +8246,6 @@ dependencies = [
"windows-targets 0.48.5",
]
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
[[package]]
name = "windows-sys"
version = "0.33.0"
--- cargo-crates/gilrs-0.10.2/examples/ev.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/gilrs-0.10.2/examples/ev.rs
@@ -9,6 +9,8 @@ use std::process;

4
games/veloren-weekly/files/patch-nodebug
View file

@ -1,8 +1,8 @@
Don't generate debuginfo as the binaries will be stripped
--- Cargo.toml.orig 2023-04-25 17:26:27 UTC
--- Cargo.toml.orig 2024-02-07 19:13:27 UTC
+++ Cargo.toml
@@ -79,25 +79,6 @@ panic = "abort" # don't need unwinding so we can skip
@@ -81,25 +81,6 @@ panic = "abort" # don't need unwinding so we
lto = true
debug = false
panic = "abort" # don't need unwinding so we can skip including the landing pads for that

30
games/veloren-weekly/files/patch-rust-1.75.0
View file

@ -1,12 +1,28 @@
--- rtsim/src/lib.rs.orig 2023-12-31 09:26:17 UTC
Drop after lang/rust >= 1.76 update
error[E0658]: cannot cast `dyn ai::Action<S, R>` to `dyn std::any::Any`, trait upcasting coercion is experimental
--> rtsim/src/ai/mod.rs:114:16
|
114 | match (other as &dyn Any).downcast_ref::<Self>() {
| ^^^^^
|
error[E0658]: cannot cast `dyn ai::Action<S, R>` to `dyn std::any::Any`, trait upcasting coercion is experimental
--> rtsim/src/ai/mod.rs:339:16
|
339 | match (other as &dyn Any).downcast_ref::<Self>() {
| ^^^^^
|
= note: see issue #65991 <https://github.com/rust-lang/rust/issues/65991> for more information
= help: add `#![feature(trait_upcasting)]` to the crate attributes to enable
= note: required when coercing `&(dyn ai::Action<S, R> + 'static)` into `&(dyn std::any::Any + 'static)`
--- rtsim/src/lib.rs.orig 2024-02-07 19:13:27 UTC
+++ rtsim/src/lib.rs
@@ -1,8 +1,7 @@
#![feature(
@@ -2,6 +2,7 @@
never_type,
try_blocks,
- generator_trait,
- generators,
+ coroutines,
trait_alias,
trait_upcasting,
+ trait_upcasting,
control_flow_enum,
let_chains,
binary_heap_drain_sorted,

16
games/veloren-weekly/files/patch-sctk
View file

@ -1,16 +0,0 @@
Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05
to ignore wl_surface::Event::preferred_buffer_scale after
https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e
https://github.com/swaywm/sway/commit/fc16fb65491b
https://github.com/hyprwm/Hyprland/commit/59f27e7f5701
--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs
@@ -283,6 +283,7 @@ impl<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
version: u32,
_: DispatchData,
) {
+ let version = I::VERSION.min(version);
self.global = Some((*registry.bind::<I>(version, id)).clone())
}
fn get(&self) -> Option<Attached<I>> {

38
games/veloren-weekly/files/patch-shaderc
View file

@ -1,37 +1,37 @@
- Restore system shaderc support
- Detect system shaderc on BSDs
--- Cargo.lock.orig 2023-10-08 11:35:01 UTC
--- Cargo.lock.orig 2024-02-07 19:13:27 UTC
+++ Cargo.lock
@@ -5614,8 +5614,9 @@ name = "shaderc"
@@ -5792,8 +5792,9 @@ dependencies = [
[[package]]
name = "shaderc"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
+version = "0.8.2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31cef52787a0db5108788ea20bed13d6bf4b96287c5c5201e55725f7070f3443"
+checksum = "27e07913ada18607bb60d12431cbe3358d3bbebbe95948e1618851dc01e63b7b"
dependencies = [
"libc",
"shaderc-sys",
@@ -5623,8 +5624,9 @@ name = "shaderc-sys"
@@ -5801,8 +5802,9 @@ dependencies = [
[[package]]
name = "shaderc-sys"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
+version = "0.8.2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e8f8439fffcffd6efcd74197204addf935dbab5752696bd990a6cd36d54cf64"
+checksum = "73120d240fe22196300f39ca8547ca2d014960f27b19b47b21288b396272f7f7"
dependencies = [
"cmake",
"libc",
--- voxygen/Cargo.toml.orig 2023-01-06 18:27:46 UTC
--- voxygen/Cargo.toml.orig 2024-02-07 19:13:27 UTC
+++ voxygen/Cargo.toml
@@ -29,14 +29,13 @@ egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend"
tracy-memory = ["tracy"] # enables heap profiling with tracy
plugins = ["client/plugins"]
plugins = ["client/plugins", "common-assets/plugins"]
egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"]
-shaderc-from-source = ["shaderc/build-from-source"]
discord = ["discord-sdk"]
@ -45,10 +45,10 @@
default = ["default-no-egui", "egui-ui"]
[dependencies]
@@ -60,9 +59,7 @@ bytemuck = { version="1.4", features=["derive"] }
wgpu = { version = "=0.8.0", features = ["trace", "cross"] }
wgpu-profiler = { git = "https://github.com/Imberflur/wgpu-profiler", tag = "wgpu-0.8" }
bytemuck = { version="1.4", features=["derive"] }
@@ -60,9 +59,7 @@ bytemuck = { version="1.7", features=["derive"] }
wgpu = { version = "0.18.0", default-features = false, features = ["trace", "spirv", "glsl"] }
wgpu-profiler = "0.15.0"
bytemuck = { version="1.7", features=["derive"] }
-# shaderc = "0.8.0"
-# Working around a current bug in shaderc that causes it to use the system installation even if we specify compile from source
-shaderc = { git = "https://github.com/pythonesque/shaderc-rs", rev = "f2605a02062834019bedff911aee2fd2998c49f9" }
@ -56,16 +56,16 @@
# cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version
# see https://github.com/alexcrichton/cmake-rs/issues/131
cmake = "=0.1.45"
--- cargo-crates/shaderc-sys-0.8.2/build/build.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/shaderc-sys-0.8.2/build/build.rs
@@ -287,10 +287,13 @@ fn main() {
--- cargo-crates/shaderc-sys-0.8.3/build/build.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/shaderc-sys-0.8.3/build/build.rs
@@ -309,10 +309,13 @@ fn main() {
}
} {
match (target_os.as_str(), target_env.as_str()) {
- ("linux", _) => {
+ ("linux", _) | ("dragonfly", _) | ("freebsd", _) | ("netbsd", _) | ("openbsd", _) => {
println!("cargo:rustc-link-search=native={}", search_dir_str);
println!("cargo:rustc-link-lib={}={}", lib_kind, lib_name);
println!("cargo:rustc-link-search=native={search_dir_str}");
println!("cargo:rustc-link-lib={lib_kind}={lib_name}");
- println!("cargo:rustc-link-lib=dylib=stdc++");
+ println!("cargo:rustc-link-lib=dylib={}", match target_os.as_str() {
+ "freebsd" | "openbsd" => "c++",
@ -74,7 +74,7 @@
return;
}
("windows", "msvc") => {
@@ -373,8 +376,8 @@ fn emit_std_cpp_link() {
@@ -395,8 +398,8 @@ fn emit_std_cpp_link() {
let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap();
match (target_os.as_str(), target_env.as_str()) {

6
games/veloren-weekly/files/patch-unix
View file

@ -11,14 +11,14 @@ Relax Linux checks for the code works on any non-Windows platform.
let _ = signal_hook::flag::register(signal_hook::consts::SIGUSR1, Arc::clone(&sigusr1_signal));
let (_guards, _guards2) = if basic {
--- voxygen/src/main.rs.orig 2024-01-31 15:30:47 UTC
--- voxygen/src/main.rs.orig 2024-02-07 19:13:27 UTC
+++ voxygen/src/main.rs
@@ -51,7 +51,7 @@ fn main() {
cli::Commands::ListWgpuBackends => {
#[cfg(target_os = "windows")]
let backends = &["dx11", "dx12", "vulkan"];
let backends = &["opengl", "dx12", "vulkan"];
- #[cfg(target_os = "linux")]
+ #[cfg(not(any(target_os = "windows", target_os = "macos")))]
let backends = &["vulkan"];
let backends = &["opengl", "vulkan"];
#[cfg(target_os = "macos")]
let backends = &["metal"];

46
games/veloren-weekly/files/patch-wgpu
View file

@ -1,46 +0,0 @@
Chase https://gitlab.com/veloren/veloren/-/commit/3f7f7195cd92
error: no matching package named `gfx-backend-empty` found
location searched: https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521
required by package `wgpu-core v0.8.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu-core)`
... which satisfies path dependency `wgc` of package `wgpu v0.8.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu)`
... which satisfies dependency `wgpu = "^0.8"` of package `egui_wgpu_backend v0.8.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/egui_wgpu_backend-63a002c6a9b6c016e45806dd065864431caab621)`
... which satisfies git dependency `egui_wgpu_backend` of package `veloren-voxygen v0.15.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/veloren-v0.15.0-403-g204834c98/voxygen)`
*** Error code 101
--- ../wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu-core/Cargo.toml.orig 2022-08-19 01:35:57 UTC
+++ ../wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu-core/Cargo.toml
@@ -39,24 +39,24 @@ gpu-descriptor = "0.1"
gpu-alloc = "0.4"
gpu-descriptor = "0.1"
-hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
+hal = { package = "gfx-hal", git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
+gfx-backend-empty = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
[target.'cfg(all(not(target_arch = "wasm32"), all(unix, not(target_os = "ios"), not(target_os = "macos"))))'.dependencies]
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521", features = ["naga"] }
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
+gfx-backend-vulkan = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1", features = ["naga"] }
+gfx-backend-gl = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
[target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
-gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
+gfx-backend-metal = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
#TODO: could also depend on gfx-backend-vulkan for Vulkan Portability
[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
-gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521", features = ["naga"] }
+gfx-backend-dx12 = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
+gfx-backend-dx11 = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
+gfx-backend-vulkan = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1", features = ["naga"] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
+gfx-backend-gl = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"