cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

games/veloren: update to 0.14.0

Browse Source 
Changes:	https://veloren.net/release-0-14/
Changes:	https://gitlab.com/veloren/veloren/-/releases/v0.14.0
Reported by:	GitLab (notify releases)
This commit is contained in:
Jan Beich 2023-01-06 18:27:46 +00:00
parent 1a228580c3
commit 83b18f5c32
8 changed files with 1100 additions and 963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
games/veloren/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= veloren
DISTVERSIONPREFIX= v
DISTVERSION= 0.13.0
PORTREVISION= 4
DISTVERSION= 0.14.0
CATEGORIES= games # wayland: depends on https://gitlab.com/veloren/veloren/-/issues/1567
.if !make(makesum)
MASTER_SITES= LOCAL/jbeich
@ -24,10 +23,10 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
USES= cargo python:3.4+,build xorg
USES= cargo xorg
USE_XORG= xcb
USE_GITLAB= yes
GL_COMMIT= 34ae5b9df73f367fa34350337ebba71711f48b86
GL_COMMIT= 185dccc1cc1498d810de907b26699c85bfd1bac0
CARGO_ENV= VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib"
PLIST_FILES= bin/${PORTNAME}-server-cli \
bin/${PORTNAME}-voxygen \
@ -55,9 +54,6 @@ post-patch:
# Respect PREFIX != /usr/local for system assets
@${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \
${WRKSRC}/common/assets/src/lib.rs
# lang/python3 cannot be used as a dependency
@${REINPLACE_CMD} -e 's/"python3"/"${PYTHON_CMD:T}"/' \
${WRKSRC}/cargo-crates/xcb-*/build.rs
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

533
games/veloren/Makefile.crates
View File

@ -1,17 +1,21 @@
CARGO_CRATES= ab_glyph-0.2.15 \
ab_glyph_rasterizer-0.1.5 \
CARGO_CRATES= ab_glyph-0.2.17 \
ab_glyph_rasterizer-0.1.7 \
addr2line-0.17.0 \
adler-1.0.2 \
adler32-1.2.0 \
ahash-0.3.8 \
ahash-0.4.7 \
ahash-0.7.6 \
aho-corasick-0.7.18 \
ahash-0.8.0 \
aho-corasick-0.7.19 \
alsa-0.6.0 \
alsa-sys-0.3.1 \
andrew-0.3.1 \
android_system_properties-0.1.5 \
ansi-parser-0.8.0 \
ansi_term-0.12.1 \
anyhow-1.0.65 \
app_dirs2-2.5.4 \
approx-0.3.2 \
approx-0.4.0 \
approx-0.5.1 \
@ -22,76 +26,80 @@ CARGO_CRATES= ab_glyph-0.2.15 \
arrayvec-0.7.2 \
as-slice-0.1.5 \
ash-0.32.1 \
assets_manager-0.8.1 \
async-channel-1.6.1 \
async-trait-0.1.53 \
assets_manager-0.9.0 \
async-channel-1.7.1 \
async-trait-0.1.57 \
atom-0.3.6 \
atomic-polyfill-0.1.10 \
atomic_refcell-0.1.8 \
atomicwrites-0.3.1 \
atty-0.2.14 \
autocfg-1.1.0 \
backtrace-0.3.65 \
base-x-0.2.8 \
backtrace-0.3.66 \
bare-metal-0.2.5 \
bare-metal-1.0.0 \
base64-0.13.0 \
bincode-1.3.3 \
bindgen-0.56.0 \
bit-set-0.5.2 \
bindgen-0.59.2 \
bit-set-0.5.3 \
bit-vec-0.6.3 \
bit_field-0.10.1 \
bitfield-0.13.2 \
bitflags-1.3.2 \
bitvec-0.22.3 \
bitvec-1.0.1 \
blake2b_simd-0.5.11 \
block-0.1.6 \
block-buffer-0.10.2 \
block-buffer-0.10.3 \
bstr-0.2.17 \
bumpalo-3.9.1 \
bytecheck-0.6.7 \
bytecheck_derive-0.6.7 \
bytemuck-1.9.1 \
bytemuck_derive-1.1.0 \
bumpalo-3.11.0 \
bytecheck-0.6.9 \
bytecheck_derive-0.6.9 \
bytemuck-1.12.1 \
bytemuck_derive-1.2.1 \
byteorder-1.4.3 \
bytes-1.1.0 \
bytes-1.2.1 \
cache-padded-1.2.0 \
calloop-0.6.5 \
cassowary-0.3.0 \
cast-0.2.7 \
cast-0.3.0 \
cc-1.0.73 \
censor-0.2.0 \
cesu8-1.1.0 \
cexpr-0.4.0 \
cexpr-0.6.0 \
cfg-if-0.1.10 \
cfg-if-1.0.0 \
cfg_aliases-0.1.1 \
chrono-0.4.19 \
chrono-tz-0.6.1 \
chrono-tz-build-0.0.2 \
chrono-0.4.22 \
chrono-tz-0.6.3 \
chrono-tz-build-0.0.3 \
chumsky-0.8.0 \
clang-sys-1.3.1 \
clang-sys-1.4.0 \
clap-2.34.0 \
clap-3.1.10 \
clap_derive-3.1.7 \
clap_lex-0.1.1 \
clap-3.2.22 \
clap_derive-3.2.18 \
clap_lex-0.2.4 \
clipboard-win-3.1.1 \
clipboard-win-4.4.1 \
clipboard-win-4.4.2 \
clipboard_macos-0.1.0 \
clipboard_wayland-0.2.0 \
clipboard_x11-0.3.1 \
clipboard_x11-0.4.0 \
cloudabi-0.0.3 \
cmake-0.1.45 \
cocoa-0.24.0 \
cocoa-foundation-0.1.0 \
codespan-reporting-0.11.1 \
color_quant-1.1.0 \
combine-4.6.3 \
concurrent-queue-1.2.2 \
combine-4.6.6 \
concurrent-queue-1.2.4 \
const-random-0.1.13 \
const-random-macro-0.1.13 \
constant_time_eq-0.1.5 \
copy_dir-0.1.2 \
copyless-0.1.5 \
copypasta-0.7.1 \
core-foundation-0.6.4 \
core-foundation-0.7.0 \
core-foundation-0.9.3 \
core-foundation-sys-0.6.2 \
core-foundation-sys-0.7.0 \
core-foundation-sys-0.8.3 \
core-graphics-0.19.2 \
@ -99,9 +107,11 @@ CARGO_CRATES= ab_glyph-0.2.15 \
core-graphics-types-0.1.1 \
core-video-sys-0.1.4 \
coreaudio-rs-0.10.0 \
coreaudio-sys-0.2.9 \
coreaudio-sys-0.2.10 \
cortex-m-0.7.6 \
cpal-0.13.5 \
cpufeatures-0.2.2 \
cpal-0.14.0 \
cpufeatures-0.2.5 \
cranelift-bforest-0.76.0 \
cranelift-codegen-0.76.0 \
cranelift-codegen-meta-0.76.0 \
@ -110,22 +120,23 @@ CARGO_CRATES= ab_glyph-0.2.15 \
cranelift-frontend-0.76.0 \
crc32fast-1.3.2 \
criterion-0.3.4 \
criterion-plot-0.4.4 \
crossbeam-0.8.1 \
crossbeam-channel-0.5.4 \
criterion-plot-0.4.5 \
critical-section-0.2.7 \
crossbeam-0.8.2 \
crossbeam-channel-0.5.6 \
crossbeam-deque-0.7.4 \
crossbeam-deque-0.8.1 \
crossbeam-deque-0.8.2 \
crossbeam-epoch-0.8.2 \
crossbeam-epoch-0.9.8 \
crossbeam-queue-0.3.5 \
crossbeam-epoch-0.9.10 \
crossbeam-queue-0.3.6 \
crossbeam-utils-0.7.2 \
crossbeam-utils-0.8.8 \
crossbeam-utils-0.8.11 \
crossterm-0.17.7 \
crossterm-0.23.2 \
crossterm-0.25.0 \
crossterm_winapi-0.6.2 \
crossterm_winapi-0.9.0 \
crunchy-0.2.2 \
crypto-common-0.1.3 \
crypto-common-0.1.6 \
csv-1.1.6 \
csv-core-0.1.10 \
ct-logs-0.8.0 \
@ -133,36 +144,39 @@ CARGO_CRATES= ab_glyph-0.2.15 \
d3d12-0.4.1 \
daggy-0.5.0 \
darling-0.10.2 \
darling-0.13.2 \
darling-0.13.4 \
darling_core-0.10.2 \
darling_core-0.13.2 \
darling_core-0.13.4 \
darling_macro-0.10.2 \
darling_macro-0.13.2 \
darling_macro-0.13.4 \
deflate-1.0.0 \
deunicode-1.3.1 \
digest-0.10.3 \
deunicode-1.3.2 \
digest-0.10.5 \
directories-next-2.0.0 \
dirs-4.0.0 \
dirs-next-2.0.0 \
dirs-sys-0.3.7 \
dirs-sys-next-0.1.2 \
discard-1.0.4 \
discord-sdk-0.3.0 \
dispatch-0.1.4 \
dispatch-0.2.0 \
dlib-0.4.2 \
dlib-0.5.0 \
dot_vox-4.1.0 \
downcast-rs-1.2.0 \
drop_guard-0.3.0 \
egui-0.12.0 \
egui_winit_platform-0.8.0 \
either-1.6.1 \
either-1.8.0 \
emath-0.12.0 \
embedded-hal-0.2.7 \
endian-type-0.1.2 \
enum-iterator-0.7.0 \
enum-iterator-1.1.3 \
enum-iterator-derive-0.7.0 \
enumset-1.0.9 \
enumset_derive-0.5.6 \
env_logger-0.8.4 \
enum-iterator-derive-1.1.0 \
enumset-1.0.11 \
enumset_derive-0.6.0 \
epaint-0.12.0 \
epi-0.12.0 \
errno-0.2.8 \
@ -171,52 +185,52 @@ CARGO_CRATES= ab_glyph-0.2.15 \
etagere-0.2.7 \
euc-0.5.3 \
euclid-0.22.7 \
event-listener-2.5.2 \
event-listener-2.5.3 \
fallible-iterator-0.2.0 \
fallible-streaming-iterator-0.1.9 \
fastrand-1.7.0 \
fd-lock-3.0.5 \
fastrand-1.8.0 \
fd-lock-3.0.4 \
fehler-1.0.0 \
fehler-macros-1.0.0 \
filetime-0.2.15 \
find_folder-0.3.0 \
fixedbitset-0.1.9 \
fixedbitset-0.2.0 \
fixedbitset-0.4.1 \
fixedbitset-0.4.2 \
flate2-1.0.24 \
float-cmp-0.9.0 \
fluent-langneg-0.13.0 \
fnv-1.0.7 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
form_urlencoded-1.0.1 \
form_urlencoded-1.1.0 \
fsevent-sys-4.1.0 \
funty-1.2.0 \
futures-0.3.21 \
futures-channel-0.3.21 \
futures-core-0.3.21 \
futures-executor-0.3.21 \
futures-io-0.3.21 \
futures-macro-0.3.21 \
futures-sink-0.3.21 \
futures-task-0.3.21 \
futures-util-0.3.21 \
funty-2.0.0 \
futures-0.3.24 \
futures-channel-0.3.24 \
futures-core-0.3.24 \
futures-executor-0.3.24 \
futures-io-0.3.24 \
futures-macro-0.3.24 \
futures-sink-0.3.24 \
futures-task-0.3.24 \
futures-util-0.3.24 \
fxhash-0.2.1 \
generator-0.7.0 \
generic-array-0.12.4 \
generic-array-0.13.3 \
generic-array-0.14.5 \
generic-array-0.14.6 \
gethostname-0.2.3 \
getrandom-0.1.16 \
getrandom-0.2.6 \
gilrs-0.8.2 \
gilrs-core-0.3.2 \
getrandom-0.2.7 \
gilrs-0.10.1 \
gilrs-core-0.5.1 \
gimli-0.25.0 \
gimli-0.26.1 \
git2-0.14.2 \
gimli-0.26.2 \
glam-0.10.2 \
glob-0.3.0 \
glow-0.9.0 \
glyph_brush-0.7.3 \
glyph_brush-0.7.5 \
glyph_brush_draw_cache-0.1.5 \
glyph_brush_layout-0.2.3 \
gpu-alloc-0.4.7 \
@ -224,94 +238,92 @@ CARGO_CRATES= ab_glyph-0.2.15 \
gpu-descriptor-0.1.1 \
gpu-descriptor-types-0.1.1 \
guillotiere-0.6.2 \
h2-0.3.13 \
h2-0.3.14 \
half-1.8.2 \
hash32-0.1.1 \
hash32-0.2.1 \
hashbrown-0.9.1 \
hashbrown-0.11.2 \
hashbrown-0.12.0 \
hashbrown-0.12.3 \
hashlink-0.6.0 \
heapless-0.5.6 \
heapless-0.6.1 \
heapless-0.7.16 \
heck-0.3.3 \
heck-0.4.0 \
hermit-abi-0.1.19 \
hex-0.3.2 \
hibitset-0.6.3 \
http-0.2.6 \
http-body-0.4.4 \
httparse-1.6.0 \
http-0.2.8 \
http-body-0.4.5 \
httparse-1.8.0 \
httpdate-1.0.2 \
humantime-2.1.0 \
hyper-0.14.18 \
hyper-0.14.20 \
hyper-rustls-0.22.1 \
iana-time-zone-0.1.48 \
ident_case-1.0.1 \
idna-0.2.3 \
image-0.24.2 \
indexmap-1.8.1 \
idna-0.3.0 \
image-0.24.3 \
indexmap-1.9.1 \
inline_tweak-1.0.8 \
inotify-0.9.6 \
inotify-sys-0.1.5 \
inplace_it-0.3.3 \
inplace_it-0.3.5 \
instant-0.1.12 \
io-kit-sys-0.1.0 \
io-lifetimes-0.6.1 \
itertools-0.10.3 \
intl_pluralrules-7.0.1 \
io-kit-sys-0.2.0 \
io-lifetimes-0.5.3 \
itertools-0.10.5 \
itoa-0.4.8 \
itoa-1.0.1 \
itoa-1.0.3 \
jni-0.19.0 \
jni-sys-0.3.0 \
jobserver-0.1.24 \
jpeg-decoder-0.2.6 \
js-sys-0.3.56 \
js-sys-0.3.60 \
kernel32-sys-0.2.2 \
keyboard-keynames-0.1.2 \
khronos-egl-4.1.0 \
kiddo-0.1.7 \
kiddo-0.2.4 \
kqueue-1.0.4 \
kqueue-1.0.6 \
kqueue-sys-1.0.3 \
lazy-bytes-cast-5.0.1 \
lazy_static-1.4.0 \
lazycell-1.3.0 \
leb128-0.2.5 \
lewton-0.10.2 \
libc-0.2.121 \
libgit2-sys-0.13.2+1.4.2 \
libc-0.2.133 \
libloading-0.6.7 \
libloading-0.7.3 \
libm-0.1.4 \
libm-0.2.2 \
libm-0.2.5 \
libmimalloc-sys-0.1.25 \
libsqlite3-sys-0.20.1 \
libudev-sys-0.1.4 \
libz-sys-1.1.5 \
linked-hash-map-0.5.4 \
linked-hash-map-0.5.6 \
linux-raw-sys-0.0.42 \
lock_api-0.3.4 \
lock_api-0.4.7 \
log-0.4.16 \
loom-0.5.4 \
lock_api-0.4.9 \
log-0.4.17 \
loom-0.5.6 \
loupe-0.1.3 \
loupe-derive-0.1.3 \
lz-fear-0.1.1 \
mach-0.2.3 \
mach-0.3.2 \
malloc_buf-0.0.6 \
matchers-0.1.0 \
matches-0.1.9 \
maybe-uninit-2.0.0 \
memchr-2.4.1 \
memmap-0.7.0 \
memchr-2.5.0 \
memmap2-0.1.0 \
memmap2-0.3.1 \
memmap2-0.5.3 \
memmap2-0.5.7 \
memoffset-0.5.6 \
memoffset-0.6.5 \
metal-0.22.0 \
mimalloc-0.1.29 \
minifb-0.22.0 \
minifb-0.23.0 \
minimal-lexical-0.2.1 \
miniz_oxide-0.5.1 \
miniz_oxide-0.5.4 \
mio-0.7.14 \
mio-0.8.2 \
mio-misc-1.2.2 \
@ -320,60 +332,67 @@ CARGO_CRATES= ab_glyph-0.2.15 \
more-asserts-0.2.2 \
mumble-link-0.1.0 \
native-dialog-0.6.3 \
nb-0.1.3 \
nb-1.0.0 \
ndk-0.3.0 \
ndk-0.6.0 \
ndk-context-0.1.0 \
ndk-0.7.0 \
ndk-context-0.1.1 \
ndk-glue-0.3.0 \
ndk-glue-0.6.1 \
ndk-glue-0.6.2 \
ndk-macro-0.2.0 \
ndk-macro-0.3.0 \
ndk-sys-0.2.2 \
ndk-sys-0.3.0 \
ndk-sys-0.4.0 \
nibble_vec-0.1.0 \
nix-0.18.0 \
nix-0.20.0 \
nix-0.22.3 \
nix-0.23.1 \
nix-0.24.2 \
nix-0.25.1 \
noise-0.7.0 \
nom-4.2.3 \
nom-5.1.2 \
nom-7.1.1 \
notify-5.0.0-pre.15 \
notify-5.0.0 \
ntapi-0.3.7 \
num-0.2.1 \
num-0.4.0 \
num-bigint-0.2.6 \
num-bigint-0.4.3 \
num-complex-0.2.4 \
num-complex-0.4.0 \
num-complex-0.4.2 \
num-derive-0.3.3 \
num-integer-0.1.44 \
num-iter-0.1.42 \
num-integer-0.1.45 \
num-iter-0.1.43 \
num-rational-0.2.4 \
num-rational-0.4.0 \
num-traits-0.2.14 \
num-rational-0.4.1 \
num-traits-0.2.15 \
num_cpus-1.13.1 \
num_enum-0.5.7 \
num_enum_derive-0.5.7 \
num_threads-0.1.5 \
num_threads-0.1.6 \
objc-0.2.7 \
objc-foundation-0.1.1 \
objc_exception-0.1.2 \
objc_id-0.1.1 \
object-0.28.3 \
oboe-0.4.5 \
object-0.28.4 \
object-0.29.0 \
oboe-0.4.6 \
oboe-sys-0.4.5 \
ogg-0.8.0 \
once_cell-1.10.0 \
once_cell-1.15.0 \
oorandom-11.1.3 \
openssl-probe-0.1.5 \
orbclient-0.3.32 \
ordered-float-1.1.1 \
ordered-float-2.10.0 \
ordered-float-3.0.0 \
os_str_bytes-6.0.0 \
ordered-float-3.1.0 \
os_str_bytes-6.3.0 \
owned_ttf_parser-0.6.0 \
owned_ttf_parser-0.15.0 \
owned_ttf_parser-0.15.2 \
packed_simd_2-0.3.8 \
parking_lot-0.10.2 \
parking_lot-0.11.2 \
@ -382,104 +401,106 @@ CARGO_CRATES= ab_glyph-0.2.15 \
parking_lot_core-0.8.5 \
parking_lot_core-0.9.2 \
parse-zoneinfo-0.3.0 \
pdqselect-0.1.0 \
peeking_take_while-0.1.2 \
pem-1.0.2 \
percent-encoding-2.1.0 \
pem-1.1.0 \
percent-encoding-2.2.0 \
petgraph-0.4.13 \
petgraph-0.5.1 \
petgraph-0.6.0 \
phf-0.10.1 \
phf_codegen-0.10.0 \
phf_generator-0.10.0 \
phf_shared-0.10.0 \
pin-project-lite-0.2.8 \
petgraph-0.6.2 \
phf-0.11.1 \
phf_codegen-0.11.1 \
phf_generator-0.11.1 \
phf_shared-0.11.1 \
pin-project-lite-0.2.9 \
pin-utils-0.1.0 \
piston-float-0.3.0 \
piston-viewport-0.5.0 \
pistoncore-input-0.24.0 \
pkg-config-0.3.25 \
plotters-0.3.0 \
plotters-backend-0.3.2 \
plotters-svg-0.3.1 \
png-0.17.5 \
plotters-backend-0.3.4 \
plotters-svg-0.3.3 \
png-0.17.6 \
ppv-lite86-0.2.16 \
proc-macro-crate-0.1.5 \
proc-macro-crate-1.1.3 \
proc-macro-crate-1.2.1 \
proc-macro-error-1.0.4 \
proc-macro-error-attr-1.0.4 \
proc-macro-hack-0.5.19 \
proc-macro2-0.4.30 \
proc-macro2-1.0.40 \
proc-macro2-1.0.43 \
profiling-1.0.6 \
profiling-procmacros-1.0.6 \
prometheus-0.13.0 \
prometheus-hyper-0.1.4 \
prometheus-0.13.2 \
prometheus-hyper-0.1.5 \
ptr_meta-0.1.4 \
ptr_meta_derive-0.1.4 \
quick-xml-0.22.0 \
quinn-0.8.2 \
quinn-proto-0.8.2 \
quinn-udp-0.1.1 \
quinn-0.8.5 \
quinn-proto-0.8.4 \
quinn-udp-0.1.3 \
quote-0.6.13 \
quote-1.0.20 \
radium-0.6.2 \
quote-1.0.21 \
radium-0.7.0 \
radix_trie-0.2.1 \
rand-0.7.3 \
rand-0.8.5 \
rand_chacha-0.2.2 \
rand_chacha-0.3.1 \
rand_core-0.5.1 \
rand_core-0.6.3 \
rand_core-0.6.4 \
rand_distr-0.4.3 \
rand_hc-0.2.0 \
rand_xorshift-0.2.0 \
raw-window-handle-0.3.4 \
raw-window-handle-0.4.3 \
rayon-1.5.1 \
rayon-core-1.9.1 \
rcgen-0.9.2 \
raw-window-handle-0.5.0 \
rayon-1.5.3 \
rayon-core-1.9.3 \
rcgen-0.9.3 \
redox_syscall-0.1.57 \
redox_syscall-0.2.13 \
redox_syscall-0.2.16 \
redox_users-0.4.3 \
regalloc-0.0.31 \
regex-1.5.5 \
regex-1.6.0 \
regex-automata-0.1.10 \
regex-syntax-0.6.25 \
regex-syntax-0.6.27 \
region-3.0.0 \
remove_dir_all-0.5.3 \
rend-0.3.6 \
renderdoc-sys-0.7.1 \
ring-0.16.20 \
rkyv-0.7.37 \
rkyv_derive-0.7.37 \
riscv-0.7.0 \
riscv-target-0.1.2 \
rkyv-0.7.39 \
rkyv_derive-0.7.39 \
rodio-0.15.0 \
ron-0.6.6 \
ron-0.7.0 \
ron-0.7.1 \
ron-0.8.0 \
roots-0.0.6 \
rose_tree-0.2.0 \
roxmltree-0.14.1 \
rstar-0.9.2 \
rstar-0.9.3 \
rusqlite-0.24.2 \
rust-argon2-0.8.3 \
rustc-demangle-0.1.21 \
rustc-hash-1.1.0 \
rustc_version-0.2.3 \
rustc_version-0.4.0 \
rustix-0.34.1 \
rustix-0.33.7 \
rustls-0.19.1 \
rustls-0.20.4 \
rustls-0.20.6 \
rustls-native-certs-0.5.0 \
rustls-native-certs-0.6.1 \
rustls-native-certs-0.6.2 \
rustls-pemfile-0.2.1 \
rustls-pemfile-1.0.0 \
rustls-pemfile-1.0.1 \
rusttype-0.7.9 \
rusttype-0.8.3 \
rusttype-0.9.2 \
rustversion-1.0.6 \
rusty-xinput-1.2.0 \
rustyline-9.1.2 \
ryu-1.0.9 \
rustversion-1.0.9 \
rustyline-10.0.0 \
ryu-1.0.11 \
same-file-1.0.6 \
schannel-0.1.19 \
scoped-tls-1.0.0 \
@ -489,45 +510,45 @@ CARGO_CRATES= ab_glyph-0.2.15 \
sdl2-0.35.2 \
sdl2-sys-0.35.2 \
seahash-4.1.0 \
security-framework-2.6.1 \
security-framework-2.7.0 \
security-framework-sys-2.6.1 \
self_cell-0.10.2 \
semver-0.9.0 \
semver-1.0.7 \
semver-1.0.14 \
semver-parser-0.7.0 \
serde-1.0.136 \
serde_bytes-0.11.5 \
serde-1.0.144 \
serde_bytes-0.11.7 \
serde_cbor-0.11.2 \
serde_derive-1.0.136 \
serde_json-1.0.79 \
serde_repr-0.1.7 \
sha1-0.6.1 \
sha1_smol-1.0.0 \
sha2-0.10.2 \
shaderc-0.8.0 \
shaderc-sys-0.8.0 \
serde_derive-1.0.144 \
serde_json-1.0.85 \
serde_repr-0.1.9 \
sha2-0.10.6 \
shaderc-0.8.1 \
shaderc-sys-0.8.1 \
sharded-slab-0.1.4 \
shell-words-1.1.0 \
shellexpand-2.1.0 \
shlex-0.1.1 \
shellexpand-2.1.2 \
shlex-1.1.0 \
shred-0.13.0 \
shred-derive-0.6.3 \
shrev-1.1.1 \
shrev-1.1.3 \
signal-hook-0.1.17 \
signal-hook-0.3.13 \
signal-hook-0.3.14 \
signal-hook-mio-0.2.3 \
signal-hook-registry-1.4.0 \
siphasher-0.3.10 \
slab-0.4.6 \
slab-0.4.7 \
slotmap-0.4.3 \
slotmap-1.0.6 \
smallvec-1.8.0 \
smallvec-1.9.0 \
smithay-client-toolkit-0.12.3 \
smithay-client-toolkit-0.15.3 \
smithay-clipboard-0.6.5 \
socket2-0.4.4 \
smithay-client-toolkit-0.16.0 \
smithay-clipboard-0.6.6 \
socket2-0.4.7 \
specs-0.18.0 \
specs-derive-0.4.1 \
spin-0.5.2 \
spin-0.9.4 \
spin_sleep-1.1.1 \
spirv_cross-0.23.1 \
spirv_headers-1.5.0 \
@ -535,94 +556,99 @@ CARGO_CRATES= ab_glyph-0.2.15 \
static_assertions-1.1.0 \
stb_truetype-0.3.1 \
stdweb-0.1.3 \
stdweb-0.4.20 \
stdweb-derive-0.5.3 \
stdweb-internal-macros-0.2.9 \
stdweb-internal-runtime-0.1.5 \
storage-map-0.3.0 \
str-buf-1.0.5 \
str-buf-1.0.6 \
strsim-0.8.0 \
strsim-0.9.3 \
strsim-0.10.0 \
structopt-0.3.26 \
structopt-derive-0.4.18 \
strum-0.24.0 \
strum_macros-0.24.0 \
strum-0.24.1 \
strum_macros-0.24.3 \
sum_type-0.2.0 \
svg_fmt-0.4.1 \
syn-0.15.44 \
syn-1.0.98 \
syn-1.0.100 \
tap-1.0.1 \
tar-0.4.38 \
target-lexicon-0.12.3 \
target-lexicon-0.12.4 \
tempfile-3.3.0 \
termcolor-1.1.3 \
textwrap-0.11.0 \
textwrap-0.15.0 \
thiserror-1.0.30 \
thiserror-impl-1.0.30 \
textwrap-0.15.1 \
thiserror-1.0.35 \
thiserror-impl-1.0.35 \
thread_local-1.1.4 \
thunderdome-0.4.2 \
time-0.1.44 \
time-0.3.9 \
time-0.3.14 \
tiny-keccak-2.0.2 \
tinystr-0.3.4 \
tinytemplate-1.2.1 \
tinyvec-1.5.1 \
tinyvec-1.6.0 \
tinyvec_macros-0.1.0 \
tokio-1.17.0 \
tokio-macros-1.7.0 \
tokio-1.20.0 \
tokio-macros-1.8.0 \
tokio-rustls-0.22.0 \
tokio-stream-0.1.8 \
tokio-stream-0.1.10 \
tokio-util-0.7.1 \
toml-0.5.8 \
tower-service-0.3.1 \
tracing-0.1.32 \
toml-0.5.9 \
tower-service-0.3.2 \
tracing-0.1.36 \
tracing-appender-0.2.2 \
tracing-attributes-0.1.20 \
tracing-core-0.1.24 \
tracing-log-0.1.2 \
tracing-subscriber-0.3.10 \
tracing-attributes-0.1.22 \
tracing-core-0.1.29 \
tracing-log-0.1.3 \
tracing-subscriber-0.3.15 \
tracing-tracy-0.9.0 \
tracy-client-0.13.2 \
tracy-client-sys-0.17.0 \
tracy-client-sys-0.17.1 \
treeculler-0.2.0 \
try-lock-0.2.3 \
ttf-parser-0.6.2 \
ttf-parser-0.15.0 \
ttf-parser-0.15.2 \
tuple_utils-0.4.0 \
twox-hash-1.6.2 \
twox-hash-1.6.3 \
tynm-0.1.6 \
type-map-0.5.0 \
typenum-1.15.0 \
uncased-0.9.6 \
unicode-bidi-0.3.7 \
unicode-ident-1.0.1 \
unicode-normalization-0.1.19 \
unicode-segmentation-1.9.0 \
unicode-width-0.1.9 \
uncased-0.9.7 \
unic-langid-0.9.0 \
unic-langid-impl-0.9.0 \
unicode-bidi-0.3.8 \
unicode-ident-1.0.4 \
unicode-normalization-0.1.22 \
unicode-segmentation-1.10.0 \
unicode-width-0.1.10 \
unicode-xid-0.1.0 \
untrusted-0.7.1 \
url-2.2.2 \
url-2.3.1 \
utf8parse-0.2.0 \
uuid-0.8.2 \
uuid-1.1.2 \
valuable-0.1.0 \
vcell-0.1.3 \
vcpkg-0.2.15 \
vec_map-0.8.2 \
vek-0.14.1 \
version-compare-0.1.0 \
version_check-0.1.5 \
version_check-0.9.4 \
void-1.0.2 \
volatile-register-0.2.1 \
walkdir-0.1.8 \
walkdir-2.3.2 \
want-0.3.0 \
wasi-0.9.0+wasi-snapshot-preview1 \
wasi-0.10.0+wasi-snapshot-preview1 \
wasi-0.11.0+wasi-snapshot-preview1 \
wasm-bindgen-0.2.79 \
wasm-bindgen-backend-0.2.79 \
wasm-bindgen-futures-0.4.29 \
wasm-bindgen-macro-0.2.79 \
wasm-bindgen-macro-support-0.2.79 \
wasm-bindgen-shared-0.2.79 \
wasm-bindgen-0.2.83 \
wasm-bindgen-backend-0.2.83 \
wasm-bindgen-futures-0.4.33 \
wasm-bindgen-macro-0.2.83 \
wasm-bindgen-macro-support-0.2.83 \
wasm-bindgen-shared-0.2.83 \
wasm-encoder-0.17.0 \
wasmer-2.2.1 \
wasmer-compiler-2.2.1 \
wasmer-compiler-cranelift-2.2.1 \
@ -634,27 +660,26 @@ CARGO_CRATES= ab_glyph-0.2.15 \
wasmer-types-2.2.1 \
wasmer-vm-2.2.1 \
wasmparser-0.78.2 \
wast-39.0.0 \
wat-1.0.41 \
wavefront-0.2.2 \
wast-47.0.0 \
wat-1.0.49 \
wavefront-0.2.3 \
wayland-client-0.28.6 \
wayland-client-0.29.4 \
wayland-client-0.29.5 \
wayland-commons-0.28.6 \
wayland-commons-0.29.4 \
wayland-commons-0.29.5 \
wayland-cursor-0.28.6 \
wayland-cursor-0.29.4 \
wayland-cursor-0.29.5 \
wayland-protocols-0.28.6 \
wayland-protocols-0.29.4 \
wayland-protocols-0.29.5 \
wayland-scanner-0.28.6 \
wayland-scanner-0.29.4 \
wayland-scanner-0.29.5 \
wayland-sys-0.28.6 \
wayland-sys-0.29.4 \
wayland-sys-0.29.5 \
web-sys-0.3.50 \
webpki-0.21.4 \
webpki-0.22.0 \
wfd-0.1.7 \
which-3.1.1 \
which-4.2.5 \
which-4.3.0 \
winapi-0.2.8 \
winapi-0.3.9 \
winapi-build-0.1.1 \
@ -662,49 +687,61 @@ CARGO_CRATES= ab_glyph-0.2.15 \
winapi-util-0.1.5 \
winapi-wsapoll-0.1.1 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
window_clipboard-0.2.2 \
window_clipboard-0.2.3 \
windows-0.37.0 \
windows-0.43.0 \
windows-sys-0.30.0 \
windows-sys-0.34.0 \
windows_aarch64_gnullvm-0.42.0 \
windows_aarch64_msvc-0.30.0 \
windows_aarch64_msvc-0.34.0 \
windows_aarch64_msvc-0.37.0 \
windows_aarch64_msvc-0.42.0 \
windows_i686_gnu-0.30.0 \
windows_i686_gnu-0.34.0 \
windows_i686_gnu-0.37.0 \
windows_i686_gnu-0.42.0 \
windows_i686_msvc-0.30.0 \
windows_i686_msvc-0.34.0 \
windows_i686_msvc-0.37.0 \
windows_i686_msvc-0.42.0 \
windows_x86_64_gnu-0.30.0 \
windows_x86_64_gnu-0.34.0 \
windows_x86_64_gnu-0.37.0 \
windows_x86_64_gnu-0.42.0 \
windows_x86_64_gnullvm-0.42.0 \
windows_x86_64_msvc-0.30.0 \
windows_x86_64_msvc-0.34.0 \
windows_x86_64_msvc-0.37.0 \
windows_x86_64_msvc-0.42.0 \
winit-0.25.0 \
winreg-0.10.1 \
winres-0.1.12 \
wio-0.2.2 \
wyz-0.4.0 \
wyz-0.5.0 \
x11-clipboard-0.5.3 \
x11-dl-2.19.1 \
x11rb-0.8.1 \
xattr-0.2.2 \
xcb-0.9.0 \
x11-dl-2.20.0 \
x11rb-0.9.0 \
xattr-0.2.3 \
xcb-0.10.1 \
xcb-1.2.0 \
xcursor-0.3.4 \
xdg-2.4.1 \
xi-unicode-0.3.0 \
xkb-0.2.1 \
xkbcommon-sys-0.7.5 \
xkbcommon-0.5.0 \
xml-rs-0.8.4 \
xmlparser-0.13.3 \
yasna-0.5.0 \
wgpu-profiler@git+https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8\#b156eb145bc223386ef344860d9b33b3c181650c \
tui@git+https://github.com/fdehau/tui-rs.git?branch=paragraph-scroll\#54b841fab6cfdb38e8dc1382176e965787964b4c \
xkbcommon-sys@git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=8f615dd6cd90a4ab77c45627830dde49b592b9b5\#8f615dd6cd90a4ab77c45627830dde49b592b9b5 \
conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d \
fluent,fluent-bundle,fluent-syntax,intl-memoizer@git+https://github.com/juliancoffee/fluent-rs.git?branch=patched\#929cf9512de121cce9b4cbf1cb860cd3294a1cd9 \
auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a\#fb3dcbc4962b367253f8f2f92760ef44d2679c9a \
iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=winit-0.25\#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb \
specs-idvs@git+https://gitlab.com/veloren/specs-idvs.git?rev=c17abc638f23ef221ce7384c7dd77eef757b82f4\#c17abc638f23ef221ce7384c7dd77eef757b82f4 \
naga@git+https://github.com/gfx-rs/naga?tag=gfx-25\#057d03ad86f18e3bb3866b20901d8d4e892dd3d6 \
gfx-auxil,gfx-backend-dx11,gfx-backend-dx12,gfx-backend-empty,gfx-backend-gl,gfx-backend-metal,gfx-backend-vulkan,gfx-hal,range-alloc@git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521\#27a1dae3796d33d23812f2bb8c7e3b5aea18b521 \
wgpu,wgpu-core,wgpu-types@git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08\#179ea209374a92837cde252f1d9ee01f628cae08 \
wgpu,wgpu-core,wgpu-types@git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08\#179ea209374a92837cde252f1d9ee01f628cae08 \
refinery,refinery-core,refinery-macros@git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e\#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e \
portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172 \
egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=63a002c6a9b6c016e45806dd065864431caab621\#63a002c6a9b6c016e45806dd065864431caab621 \
vek@git+https://github.com/yoanlcq/vek.git?rev=84d5cb65841d46599a986c5477341bea4456be26\#84d5cb65841d46599a986c5477341bea4456be26 \
keyboard-keynames@git+https://gitlab.com/Frinksy/keyboard-keynames.git?branch=develop\#1ae010ca032a57dfe0ba01d4346a3b03bde36de0
vek@git+https://github.com/yoanlcq/vek.git?rev=84d5cb65841d46599a986c5477341bea4456be26\#84d5cb65841d46599a986c5477341bea4456be26

1068
games/veloren/distinfo
View File

File diff suppressed because it is too large Load Diff

81
games/veloren/files/patch-gilrs-evdev
View File

@ -1,81 +0,0 @@
https://gitlab.com/gilrs-project/gilrs/-/merge_requests/56
--- cargo-crates/gilrs-0.8.2/src/mapping/mod.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/gilrs-0.8.2/src/mapping/mod.rs
@@ -24,14 +24,14 @@ use vec_map::VecMap;
use self::parser::{Error as ParserError, ErrorKind as ParserErrorKind, Parser, Token};
/// Platform name used by SDL mappings
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
const SDL_PLATFORM_NAME: &str = "Linux";
#[cfg(target_os = "macos")]
const SDL_PLATFORM_NAME: &'static str = "Mac OS X";
#[cfg(target_os = "windows")]
const SDL_PLATFORM_NAME: &'static str = "Windows";
#[cfg(all(
- not(target_os = "linux"),
+ not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")),
not(target_os = "macos"),
not(target_os = "windows")
))]
--- cargo-crates/gilrs-core-0.3.2/Cargo.toml.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/gilrs-core-0.3.2/Cargo.toml
@@ -53,16 +53,16 @@ package = "wasm-bindgen"
[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-rs]
version = "0.2"
package = "wasm-bindgen"
-[target."cfg(target_os = \"linux\")".dependencies.libc]
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.libc]
version = "0.2"
-[target."cfg(target_os = \"linux\")".dependencies.libudev-sys]
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.libudev-sys]
version = "0.1"
-[target."cfg(target_os = \"linux\")".dependencies.nix]
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.nix]
version = "0.23.1"
-[target."cfg(target_os = \"linux\")".dependencies.vec_map]
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.vec_map]
version = "0.8"
[target."cfg(target_os = \"macos\")".dependencies.core-foundation]
version = "0.6"
--- cargo-crates/gilrs-core-0.3.2/src/platform/linux/ff.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/gilrs-core-0.3.2/src/platform/linux/ff.rs
@@ -104,10 +104,10 @@ impl Device {
impl Drop for Device {
fn drop(&mut self) {
- #[cfg(target_pointer_width = "64")]
- let effect = self.effect as u64;
- #[cfg(target_pointer_width = "32")]
- let effect = self.effect as u32;
+ #[cfg(target_os = "linux")]
+ let effect = self.effect as ::libc::c_ulong;
+ #[cfg(not(target_os = "linux"))]
+ let effect = self.effect as ::libc::c_int;
if let Err(err) = unsafe { ioctl::eviocrmff(self.file.as_raw_fd(), effect) } {
error!(
--- cargo-crates/gilrs-core-0.3.2/src/platform/mod.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/gilrs-core-0.3.2/src/platform/mod.rs
@@ -21,7 +21,7 @@
pub use self::platform::*;
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
#[path = "linux/mod.rs"]
mod platform;
@@ -38,7 +38,7 @@ mod platform;
mod platform;
#[cfg(all(
- not(target_os = "linux"),
+ not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")),
not(target_os = "macos"),
not(target_os = "windows"),
not(target_arch = "wasm32")

227
games/veloren/files/patch-quinn
View File

@ -1,40 +1,231 @@
https://github.com/quinn-rs/quinn/issues/1142
https://github.com/quinn-rs/quinn/commit/166e0fb60a64
--- cargo-crates/quinn-udp-0.1.1/src/unix.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/quinn-udp-0.1.1/src/unix.rs
@@ -229,7 +229,7 @@ fn send(
--- cargo-crates/quinn-0.8.5/src/connection.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/quinn-0.8.5/src/connection.rs
@@ -146,6 +146,8 @@ impl Connecting {
/// Retrieving the local IP address is currently supported on the following
/// platforms:
/// - Linux
+ /// - FreeBSD
+ /// - macOS
///
/// On all non-supported platforms the local IP address will not be available,
/// and the method will return `None`.
--- cargo-crates/quinn-0.8.5/src/tests.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/quinn-0.8.5/src/tests.rs
@@ -479,7 +479,8 @@ fn run_echo(args: EchoArgs) {
// If `local_ip` gets available on additional platforms - which
// requires modifying this test - please update the list of supported
// platforms in the doc comments of the various `local_ip` functions.
- if cfg!(target_os = "linux") {
+ if cfg!(target_os = "linux") || cfg!(target_os = "freebsd") || cfg!(target_os = "macos")
+ {
let local_ip = incoming.local_ip().expect("Local IP must be available");
assert!(local_ip.is_loopback());
} else {
--- cargo-crates/quinn-udp-0.1.3/src/unix.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/quinn-udp-0.1.3/src/unix.rs
@@ -99,7 +99,7 @@ fn init(io: &std::net::UdpSocket) -> io::Result<()> {
fn init(io: &std::net::UdpSocket) -> io::Result<()> {
let mut cmsg_platform_space = 0;
- if cfg!(target_os = "linux") {
+ if cfg!(target_os = "linux") || cfg!(target_os = "freebsd") || cfg!(target_os = "macos") {
cmsg_platform_space +=
unsafe { libc::CMSG_SPACE(mem::size_of::<libc::in6_pktinfo>() as _) as usize };
}
@@ -174,13 +174,20 @@ fn init(io: &std::net::UdpSocket) -> io::Result<()> {
if rc == -1 {
return Err(io::Error::last_os_error());
}
-
+ }
+ }
+ #[cfg(any(target_os = "freebsd", target_os = "macos"))]
+ // IP_RECVDSTADDR == IP_SENDSRCADDR on FreeBSD
+ // macOS uses only IP_RECVDSTADDR, no IP_SENDSRCADDR on macOS
+ // macOS also supports IP_PKTINFO
+ {
+ if addr.is_ipv4() {
let on: libc::c_int = 1;
let rc = unsafe {
libc::setsockopt(
io.as_raw_fd(),
- libc::IPPROTO_IPV6,
- libc::IPV6_RECVPKTINFO,
+ libc::IPPROTO_IP,
+ libc::IP_RECVDSTADDR,
&on as *const _ as _,
mem::size_of_val(&on) as _,
)
@@ -190,12 +197,28 @@ fn init(io: &std::net::UdpSocket) -> io::Result<()> {
}
}
}
+
+ // IPV6_RECVPKTINFO is standardized
if addr.is_ipv6() {
let on: libc::c_int = 1;
let rc = unsafe {
libc::setsockopt(
io.as_raw_fd(),
libc::IPPROTO_IPV6,
+ libc::IPV6_RECVPKTINFO,
+ &on as *const _ as _,
+ mem::size_of_val(&on) as _,
+ )
+ };
+ if rc == -1 {
+ return Err(io::Error::last_os_error());
+ }
+
+ let on: libc::c_int = 1;
+ let rc = unsafe {
+ libc::setsockopt(
+ io.as_raw_fd(),
+ libc::IPPROTO_IPV6,
libc::IPV6_RECVTCLASS,
&on as *const _ as _,
mem::size_of_val(&on) as _,
@@ -210,11 +233,21 @@ fn send(
#[cfg(not(any(target_os = "macos", target_os = "ios")))]
fn send(
+ #[allow(unused_variables)] // only used on Linux
state: &UdpState,
io: &std::net::UdpSocket,
last_send_error: &mut Instant,
transmits: &[Transmit],
) -> io::Result<usize> {
+ #[allow(unused_mut)] // only mutable on FeeBSD
+ let mut encode_src_ip = true;
+ #[cfg(target_os = "freebsd")]
+ {
+ let addr = io.local_addr()?;
+ if addr.is_ipv4() {
+ encode_src_ip = addr.ip().is_unspecified();
+ }
+ }
let mut msgs: [libc::mmsghdr; BATCH_SIZE] = unsafe { mem::zeroed() };
let mut iovecs: [libc::iovec; BATCH_SIZE] = unsafe { mem::zeroed() };
let mut cmsgs = [cmsg::Aligned([0u8; CMSG_LEN]); BATCH_SIZE];
@@ -240,13 +273,13 @@ fn send(
&mut msgs[i].msg_hdr,
&mut iovecs[i],
&mut cmsgs[i],
+ encode_src_ip,
);
}
let num_transmits = transmits.len().min(BATCH_SIZE);
loop {
let n =
- let n =
- unsafe { libc::sendmmsg(io.as_raw_fd(), msgs.as_mut_ptr(), num_transmits as u32, 0) };
+ unsafe { libc::sendmmsg(io.as_raw_fd(), msgs.as_mut_ptr(), num_transmits as usize, 0) };
+ let n = unsafe { libc::sendmmsg(io.as_raw_fd(), msgs.as_mut_ptr(), num_transmits as _, 0) };
if n == -1 {
let e = io::Error::last_os_error();
match e.kind() {
@@ -338,7 +338,7 @@ fn recv(
@@ -302,9 +335,18 @@ fn send(
let mut iov: libc::iovec = unsafe { mem::zeroed() };
let mut ctrl = cmsg::Aligned([0u8; CMSG_LEN]);
let mut sent = 0;
+
while sent < transmits.len() {
let addr = socket2::SockAddr::from(transmits[sent].destination);
- prepare_msg(&transmits[sent], &addr, &mut hdr, &mut iov, &mut ctrl);
+ prepare_msg(
+ &transmits[sent],
+ &addr,
+ &mut hdr,
+ &mut iov,
+ &mut ctrl,
+ // Only tested on macOS
+ cfg!(target_os = "macos"),
+ );
let n = unsafe { libc::sendmsg(io.as_raw_fd(), &hdr, 0) };
if n == -1 {
let e = io::Error::last_os_error();
@@ -355,7 +397,7 @@ fn recv(
libc::recvmmsg(
io.as_raw_fd(),
hdrs.as_mut_ptr(),
- bufs.len().min(BATCH_SIZE) as libc::c_uint,
+ bufs.len().min(BATCH_SIZE) as usize,
+ bufs.len().min(BATCH_SIZE) as _,
0,
ptr::null_mut(),
std::ptr::null_mut(),
)
@@ -432,7 +432,8 @@ fn prepare_msg(
@@ -418,6 +460,8 @@ fn prepare_msg(
hdr: &mut libc::msghdr,
iov: &mut libc::iovec,
ctrl: &mut cmsg::Aligned<[u8; CMSG_LEN]>,
+ #[allow(unused_variables)] // only used on FreeBSD & macOS
+ encode_src_ip: bool,
) {
iov.iov_base = transmit.contents.as_ptr() as *const _ as *mut _;
iov.iov_len = transmit.contents.len();
@@ -449,9 +493,10 @@ fn prepare_msg(
}
if let Some(ip) = &transmit.src_ip {
- if cfg!(target_os = "linux") {
+ #[cfg(target_os = "linux")]
+ {
match ip {
IpAddr::V4(v4) => {
- match ip {
- IpAddr::V4(v4) => {
+ match ip {
+ IpAddr::V4(v4) => {
+ #[cfg(target_os = "linux")]
+ {
let pktinfo = libc::in_pktinfo {
@@ -502,6 +503,7 @@ fn decode_recv(
ipi_ifindex: 0,
ipi_spec_dst: libc::in_addr {
@@ -461,16 +506,25 @@ fn prepare_msg(
};
encoder.push(libc::IPPROTO_IP, libc::IP_PKTINFO, pktinfo);
}
- IpAddr::V6(v6) => {
- let pktinfo = libc::in6_pktinfo {
- ipi6_ifindex: 0,
- ipi6_addr: libc::in6_addr {
- s6_addr: v6.octets(),
- },
- };
- encoder.push(libc::IPPROTO_IPV6, libc::IPV6_PKTINFO, pktinfo);
+ #[cfg(any(target_os = "freebsd", target_os = "macos"))]
+ {
+ if encode_src_ip {
+ let addr = libc::in_addr {
+ s_addr: u32::from_ne_bytes(v4.octets()),
+ };
+ encoder.push(libc::IPPROTO_IP, libc::IP_RECVDSTADDR, addr);
+ }
}
}
+ IpAddr::V6(v6) => {
+ let pktinfo = libc::in6_pktinfo {
+ ipi6_ifindex: 0,
+ ipi6_addr: libc::in6_addr {
+ s6_addr: v6.octets(),
+ },
+ };
+ encoder.push(libc::IPPROTO_IPV6, libc::IPV6_PKTINFO, pktinfo);
+ }
}
}
@@ -519,11 +573,17 @@ fn decode_recv(
ecn_bits = cmsg::decode::<libc::c_int>(cmsg) as u8;
}
},
+ #[cfg(target_os = "linux")]
(libc::IPPROTO_IP, libc::IP_PKTINFO) => unsafe {
let pktinfo = cmsg::decode::<libc::in_pktinfo>(cmsg);
dst_ip = Some(IpAddr::V4(ptr::read(&pktinfo.ipi_addr as *const _ as _)));
(libc::IPPROTO_IP, libc::IP_PKTINFO) => {
let pktinfo = unsafe { cmsg::decode::<libc::in_pktinfo>(cmsg) };
dst_ip = Some(IpAddr::V4(Ipv4Addr::from(
pktinfo.ipi_addr.s_addr.to_ne_bytes(),
)));
+ }
+ #[cfg(any(target_os = "freebsd", target_os = "macos"))]
+ (libc::IPPROTO_IP, libc::IP_RECVDSTADDR) => {
+ let in_addr = unsafe { cmsg::decode::<libc::in_addr>(cmsg) };
+ dst_ip = Some(IpAddr::V4(Ipv4Addr::from(in_addr.s_addr.to_ne_bytes())));
}
(libc::IPPROTO_IPV6, libc::IPV6_PKTINFO) => {
let pktinfo = unsafe { cmsg::decode::<libc::in6_pktinfo>(cmsg) };

62
games/veloren/files/patch-rust-1.63
View File

@ -1,62 +0,0 @@
error: expected one of `!` or `::`, found keyword `mod`
--> cargo-crates/packed_simd_2-0.3.7/src/lib.rs:347:7
|
347 | crate mod llvm {
| ^^^ expected one of `!` or `::`
error[E0433]: failed to resolve: could not find `OnceCell` in `lazy`
--> voxygen/src/scene/terrain.rs:558:32
|
558 | let init = core::lazy::OnceCell::new();
| ^^^^^^^^ not found in `core::lazy`
|
help: consider importing one of these items
|
3 | use core::cell::OnceCell;
|
3 | use std::cell::OnceCell;
|
3 | use tokio::sync::OnceCell;
|
help: if you import `OnceCell`, refer to it directly
|
558 - let init = core::lazy::OnceCell::new();
558 + let init = OnceCell::new();
|
--- Cargo.lock.orig 2022-08-17 12:36:05 UTC
+++ Cargo.lock
@@ -4025,9 +4025,9 @@ name = "packed_simd_2"
[[package]]
name = "packed_simd_2"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defdcfef86dcc44ad208f71d9ff4ce28df6537a4e0d6b0e8e845cb8ca10059a6"
+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
dependencies = [
"cfg-if 1.0.0",
"libm 0.1.4",
@@ -6241,7 +6241,7 @@ dependencies = [
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
"rand 0.8.5",
"static_assertions",
]
--- voxygen/src/scene/terrain.rs.orig 2022-08-17 11:42:07.587067000 +0000
+++ voxygen/src/scene/terrain.rs 2022-08-17 11:43:10.451160000 +0000
@@ -555,7 +557,7 @@ impl SpriteRenderContext {
}
});
- let init = core::lazy::OnceCell::new();
+ let init = core::cell::OnceCell::new();
let mut join_handle = Some(join_handle);
let mut closure = move |renderer: &mut Renderer| {
// The second unwrap can only fail if the sprite meshing thread panics, which

48
games/veloren/files/patch-rust-1.64
View File

@ -1,48 +0,0 @@
https://gitlab.com/veloren/veloren/-/commit/c2b453f6f19e
error[E0597]: `desc_set` does not live long enough
--> wgpu-core-a92b854/src/device/mod.rs:1792:26
|
1792 | set: desc_set.raw_mut(),
| ^^^^^^^^^^^^^^^^^^ borrowed value does not live long enough
...
1813 | }
| -
| |
| `desc_set` dropped here while still borrowed
| borrow might be used here, when `write_map` is dropped and runs the `Drop` code for type `BTreeMap`
|
= note: values in a scope are dropped in the opposite order they are defined
--- Cargo.lock.orig 2022-10-14 14:51:24UTC
+++ Cargo.lock
@@ -7464,7 +7464,7 @@ version = "0.8.0"
[[package]]
name = "wgpu"
version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
+source = "git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
dependencies = [
"arrayvec 0.5.2",
"js-sys",
@@ -7484,7 +7484,7 @@ version = "0.8.0"
[[package]]
name = "wgpu-core"
version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
+source = "git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
dependencies = [
"arrayvec 0.5.2",
"bitflags",
@@ -7524,7 +7524,7 @@ version = "0.8.0"
[[package]]
name = "wgpu-types"
version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
+source = "git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
dependencies = [
"bitflags",
"serde",

34
games/veloren/files/patch-shaderc
View File

@ -1,7 +1,37 @@
- Restore system shaderc support
- Detect system shaderc on BSDs
--- cargo-crates/shaderc-sys-0.8.0/build/build.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/shaderc-sys-0.8.0/build/build.rs
--- voxygen/Cargo.toml.orig 2023-01-06 18:27:46 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"]
egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"]
-shaderc-from-source = ["shaderc/build-from-source"]
discord = ["discord-sdk"]
bin_img-export = ["common-assets"]
# We don't ship egui with published release builds so a separate feature is required that excludes it.
default-publish = ["singleplayer", "native-dialog", "plugins", "discord", "simd"]
# Temp for bug on current wgpu version that has access violation in vulkan when constructing egui pipeline
-default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"]
+default-no-egui = ["default-publish", "hot-reloading"]
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"] }
-# 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" }
+shaderc = "0.8.0"
# 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.1/build/build.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/shaderc-sys-0.8.1/build/build.rs
@@ -287,10 +287,13 @@ fn main() {
}
} {