games/jumpy: update to 0.5.1

Changes:	https://github.com/fishfight/jumpy/releases/tag/v0.5.0
Changes:	https://github.com/fishfight/jumpy/compare/v0.5.0...v0.5.1
Reported by:	GitHub (watch releases)
This commit is contained in:
Jan Beich 2022-12-14 03:55:03 +00:00
parent 5117e87266
commit 2cff4cee26
8 changed files with 1878 additions and 560 deletions

View file

@ -1,8 +1,7 @@
PORTNAME= jumpy
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.3
PORTREVISION= 4
CATEGORIES= games
DISTVERSION= 0.5.1
CATEGORIES= games wayland
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Tactical 2D shooter in fishy pixels style
@ -14,21 +13,21 @@ LICENSE_FILE_MIT= ${WRKSRC}/licenses/LICENSE-MIT
LIB_DEPENDS= libasound.so:audio/alsa-lib \
libudev.so:devel/libudev-devd
RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
USES= cargo gl localbase:ldflags xorg
USES= cargo
USE_GITHUB= yes
USE_GL= gl
USE_XORG= x11 xi
GH_ACCOUNT= fishfolks
PLIST_FILES= bin/${PORTNAME}
PORTDATA= *
post-patch:
# Search assets under PREFIX instead of current directory
@${REINPLACE_CMD} '/_dir/s,"\.,"${DATADIR},' ${WRKSRC}/src/main.rs
@${REINPLACE_CMD} 's,assets",../${DATADIR_REL}/&,' \
${WRKSRC}/cargo-crates/bevy_asset-*/src/lib.rs
post-install:
(cd ${WRKSRC} && ${COPYTREE_SHARE} "assets mods" ${STAGEDIR}${DATADIR})
(cd ${WRKSRC} && ${COPYTREE_SHARE} "assets" ${STAGEDIR}${DATADIR})
.include <bsd.port.mk>

View file

@ -1,106 +1,485 @@
CARGO_CRATES= adler32-1.2.0 \
ahash-0.4.7 \
CARGO_CRATES= ab_glyph-0.2.18 \
ab_glyph_rasterizer-0.1.7 \
addr2line-0.17.0 \
adler-1.0.2 \
adler32-1.2.0 \
ahash-0.7.6 \
async-trait-0.1.52 \
audir-sles-0.1.0 \
audrey-0.3.0 \
ahash-0.8.2 \
aho-corasick-0.7.19 \
alsa-0.6.0 \
alsa-sys-0.3.1 \
android_log-sys-0.2.0 \
android_logger-0.10.1 \
android_system_properties-0.1.5 \
anyhow-1.0.66 \
approx-0.5.1 \
arboard-2.1.1 \
arrayvec-0.5.2 \
arrayvec-0.7.2 \
ash-0.37.0+1.3.209 \
async-channel-1.7.1 \
async-executor-1.5.0 \
async-io-1.10.0 \
async-lock-2.6.0 \
async-task-4.3.0 \
atomic-arena-0.1.1 \
atomic-waker-1.0.0 \
atomic_refcell-0.1.8 \
atty-0.2.14 \
autocfg-1.1.0 \
base-x-0.2.8 \
backtrace-0.3.66 \
base64-0.13.1 \
bevy-0.8.1 \
bevy-inspector-egui-0.13.0 \
bevy-inspector-egui-derive-0.13.0 \
bevy-parallax-0.2.0 \
bevy_app-0.8.1 \
bevy_asset-0.8.1 \
bevy_core-0.8.1 \
bevy_core_pipeline-0.8.1 \
bevy_derive-0.8.1 \
bevy_diagnostic-0.8.1 \
bevy_ecs-0.8.1 \
bevy_ecs_macros-0.8.1 \
bevy_ecs_tilemap-0.7.0 \
bevy_egui-0.16.1 \
bevy_encase_derive-0.8.1 \
bevy_fluent-0.4.0 \
bevy_framepace-0.7.0 \
bevy_gilrs-0.8.1 \
bevy_input-0.8.1 \
bevy_internal-0.8.1 \
bevy_kira_audio-0.12.0 \
bevy_log-0.8.1 \
bevy_macro_utils-0.8.1 \
bevy_math-0.8.1 \
bevy_mikktspace-0.8.1 \
bevy_pbr-0.8.1 \
bevy_prototype_lyon-0.6.0 \
bevy_ptr-0.8.1 \
bevy_reflect-0.8.1 \
bevy_reflect_derive-0.8.1 \
bevy_render-0.8.1 \
bevy_render_macros-0.8.1 \
bevy_scene-0.8.1 \
bevy_sprite-0.8.1 \
bevy_system_graph-0.3.0 \
bevy_tasks-0.8.1 \
bevy_text-0.8.1 \
bevy_time-0.8.1 \
bevy_transform-0.8.1 \
bevy_tweening-0.5.0 \
bevy_ui-0.8.1 \
bevy_utils-0.8.1 \
bevy_window-0.8.1 \
bevy_winit-0.8.1 \
bincode-1.3.3 \
bindgen-0.61.0 \
bit-set-0.5.3 \
bit-vec-0.6.3 \
bitfield-0.14.0 \
bitfield-rle-0.2.0 \
bitflags-1.3.2 \
bumpalo-3.9.1 \
bytemuck-1.7.3 \
block-0.1.6 \
blocking-1.2.0 \
bstr-0.2.17 \
bumpalo-3.11.1 \
bytemuck-1.12.3 \
bytemuck_derive-1.3.0 \
byteorder-1.4.3 \
cc-1.0.73 \
bytes-1.3.0 \
cache-padded-1.2.0 \
calloop-0.9.3 \
cc-1.0.77 \
cesu8-1.1.0 \
cexpr-0.6.0 \
cfg-if-0.1.10 \
cfg-if-1.0.0 \
cfg_aliases-0.1.1 \
clang-sys-1.4.0 \
clap-4.0.26 \
clap_derive-4.0.21 \
clap_lex-0.3.0 \
clipboard-win-4.4.2 \
cobs-0.2.3 \
cocoa-0.24.1 \
cocoa-foundation-0.1.0 \
codespan-reporting-0.11.1 \
color_quant-1.1.0 \
core-foundation-0.6.4 \
core-foundation-sys-0.6.2 \
combine-4.6.6 \
concurrent-queue-1.2.4 \
concurrent-queue-2.0.0 \
console_error_panic_hook-0.1.7 \
const_panic-0.2.6 \
copyless-0.1.5 \
core-foundation-0.7.0 \
core-foundation-0.9.3 \
core-foundation-sys-0.7.0 \
core-foundation-sys-0.8.3 \
core-graphics-0.19.2 \
core-graphics-0.22.3 \
core-graphics-types-0.1.1 \
core-video-sys-0.1.4 \
coreaudio-rs-0.10.0 \
coreaudio-sys-0.2.11 \
cpal-0.13.5 \
crc32fast-1.3.2 \
dasp_frame-0.11.0 \
dasp_sample-0.11.0 \
crossbeam-channel-0.5.6 \
crossbeam-utils-0.8.13 \
cty-0.2.2 \
d3d12-0.5.0 \
darling-0.13.4 \
darling_core-0.13.4 \
darling_macro-0.13.4 \
deflate-0.8.6 \
discard-1.0.4 \
ff-particles-0.1.2 \
derive_more-0.99.17 \
directories-4.0.1 \
dirs-sys-0.3.7 \
dispatch-0.2.0 \
displaydoc-0.2.3 \
dlib-0.5.0 \
downcast-rs-1.2.0 \
egui-0.19.0 \
egui_extras-0.19.0 \
either-1.8.0 \
emath-0.19.0 \
encase-0.3.0 \
encase_derive-0.3.0 \
encase_derive_impl-0.3.0 \
encoding_rs-0.8.31 \
env_logger-0.8.4 \
epaint-0.19.0 \
erased-serde-0.3.23 \
error-code-2.3.1 \
euclid-0.22.7 \
event-listener-2.5.3 \
failure-0.1.8 \
failure_derive-0.1.8 \
fastrand-1.8.0 \
filetime-0.2.18 \
fixedbitset-0.4.2 \
flate2-1.0.24 \
float-cmp-0.5.3 \
float_next_after-0.1.5 \
fluent-0.16.0 \
fluent-bundle-0.15.2 \
fluent-langneg-0.13.0 \
fluent-syntax-0.11.0 \
fnv-1.0.7 \
fontdue-0.5.2 \
getrandom-0.2.4 \
gilrs-0.8.2 \
gilrs-core-0.3.2 \
glam-0.14.0 \
hashbrown-0.9.1 \
hashbrown-0.12.0 \
hecs-0.7.6 \
hound-3.4.0 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
form_urlencoded-1.1.0 \
fsevent-sys-4.1.0 \
futures-0.3.25 \
futures-channel-0.3.25 \
futures-core-0.3.25 \
futures-io-0.3.25 \
futures-lite-1.12.0 \
futures-macro-0.3.25 \
futures-sink-0.3.25 \
futures-task-0.3.25 \
futures-util-0.3.25 \
fxhash-0.2.1 \
gethostname-0.2.3 \
getrandom-0.2.8 \
gilrs-0.9.0 \
gilrs-core-0.4.1 \
gimli-0.26.2 \
glam-0.21.3 \
glob-0.3.0 \
globset-0.4.9 \
glow-0.11.2 \
glyph_brush_layout-0.2.3 \
gpu-alloc-0.5.3 \
gpu-alloc-types-0.2.0 \
gpu-descriptor-0.2.3 \
gpu-descriptor-types-0.1.1 \
guillotiere-0.6.2 \
hash32-0.2.1 \
hash32-derive-0.1.1 \
hashbrown-0.12.3 \
heck-0.4.0 \
hermit-abi-0.1.19 \
hex-0.4.3 \
hexasphere-7.2.1 \
hexf-parse-0.2.1 \
ident_case-1.0.1 \
idna-0.3.0 \
image-0.23.14 \
io-kit-sys-0.1.0 \
itoa-1.0.1 \
js-sys-0.3.56 \
image-0.24.5 \
indexmap-1.9.2 \
inotify-0.9.6 \
inotify-sys-0.1.5 \
inplace_it-0.3.5 \
instant-0.1.12 \
interpolation-0.2.0 \
intl-memoizer-0.5.1 \
intl_pluralrules-7.0.2 \
io-kit-sys-0.2.0 \
itertools-0.10.5 \
itoa-1.0.4 \
iyes_loopless-0.8.0 \
jni-0.19.0 \
jni-sys-0.3.0 \
jobserver-0.1.25 \
jpeg-decoder-0.1.22 \
js-sys-0.3.60 \
khronos-egl-4.1.0 \
kira-0.6.1 \
kqueue-1.0.7 \
kqueue-sys-1.0.3 \
lazy_static-1.4.0 \
lewton-0.9.4 \
libc-0.2.118 \
lazycell-1.3.0 \
leafwing-input-manager-0.6.1 \
leafwing_input_manager_macros-0.6.0 \
libc-0.2.137 \
libloading-0.7.4 \
libmimalloc-sys-0.1.28 \
libudev-sys-0.1.4 \
log-0.4.14 \
mach-0.2.3 \
macroquad-0.3.13 \
macroquad-platformer-0.1.2 \
macroquad_macro-0.1.7 \
maybe-uninit-2.0.0 \
lock_api-0.4.9 \
log-0.4.17 \
lyon_geom-0.17.7 \
lyon_path-0.17.7 \
lyon_tessellation-0.17.10 \
mach-0.3.2 \
malloc_buf-0.0.6 \
matchers-0.1.0 \
memchr-2.5.0 \
memmap2-0.3.1 \
memoffset-0.6.5 \
miniquad-0.3.0-alpha.42 \
metal-0.24.0 \
mimalloc-0.1.32 \
minimal-lexical-0.2.1 \
miniz_oxide-0.3.7 \
miniz_oxide-0.4.4 \
miniz_oxide-0.5.4 \
miniz_oxide-0.6.2 \
mio-0.8.5 \
naga-0.9.0 \
ndk-0.5.0 \
ndk-0.6.0 \
ndk-context-0.1.1 \
ndk-glue-0.5.2 \
ndk-glue-0.6.2 \
ndk-macro-0.3.0 \
ndk-sys-0.2.2 \
ndk-sys-0.3.0 \
nix-0.22.3 \
nix-0.23.1 \
num-integer-0.1.44 \
num-iter-0.1.42 \
nix-0.24.2 \
nohash-hasher-0.2.0 \
nom-7.1.1 \
normalize-path-0.2.0 \
notify-5.0.0-pre.15 \
nu-ansi-term-0.46.0 \
num-derive-0.3.3 \
num-integer-0.1.45 \
num-iter-0.1.43 \
num-rational-0.3.2 \
num-traits-0.2.14 \
ogg-0.7.1 \
once_cell-1.9.0 \
pkg-config-0.3.24 \
num-rational-0.4.1 \
num-traits-0.2.15 \
num_cpus-1.14.0 \
num_enum-0.5.7 \
num_enum_derive-0.5.7 \
numquant-0.2.0 \
objc-0.2.7 \
objc-foundation-0.1.1 \
objc_exception-0.1.2 \
objc_id-0.1.1 \
object-0.29.0 \
oboe-0.4.6 \
oboe-sys-0.4.5 \
once_cell-1.16.0 \
openssl-probe-0.1.5 \
os_str_bytes-6.4.1 \
overload-0.1.1 \
owned_ttf_parser-0.17.1 \
parking-2.0.0 \
parking_lot-0.11.2 \
parking_lot-0.12.1 \
parking_lot_core-0.8.5 \
parking_lot_core-0.9.4 \
peeking_take_while-0.1.2 \
pem-1.1.0 \
percent-encoding-2.2.0 \
petgraph-0.6.2 \
petitset-0.2.1 \
pin-project-1.0.12 \
pin-project-internal-1.0.12 \
pin-project-lite-0.2.9 \
pin-utils-0.1.0 \
pkg-config-0.3.26 \
png-0.16.8 \
proc-macro2-1.0.36 \
quad-alsa-sys-0.3.2 \
quad-rand-0.2.1 \
quad-snd-0.2.3 \
quote-1.0.15 \
rustc_version-0.2.3 \
png-0.17.7 \
polling-2.4.0 \
postcard-1.0.2 \
pp-rs-0.2.1 \
ppv-lite86-0.2.17 \
pretty-type-name-1.0.0 \
proc-macro-crate-1.2.1 \
proc-macro-error-1.0.4 \
proc-macro-error-attr-1.0.4 \
proc-macro2-1.0.47 \
profiling-1.0.7 \
quinn-0.9.1 \
quinn-proto-0.9.1 \
quinn-udp-0.3.0 \
quote-1.0.21 \
radsort-0.1.0 \
rand-0.8.5 \
rand_chacha-0.3.1 \
rand_core-0.6.4 \
range-alloc-0.1.2 \
raw-window-handle-0.4.3 \
rcgen-0.10.0 \
rectangle-pack-0.4.2 \
redox_syscall-0.2.16 \
redox_users-0.4.3 \
regex-1.7.0 \
regex-automata-0.1.10 \
regex-syntax-0.6.28 \
renderdoc-sys-0.7.1 \
ring-0.16.20 \
ringbuf-0.2.8 \
ron-0.7.1 \
rustc-demangle-0.1.21 \
rustc-hash-1.1.0 \
rustls-0.20.7 \
rustls-native-certs-0.6.2 \
rustls-pemfile-1.0.1 \
rusty-xinput-1.2.0 \
ryu-1.0.9 \
sapp-android-0.1.14 \
sapp-darwin-0.1.6 \
sapp-dummy-0.1.5 \
sapp-ios-0.1.2 \
sapp-linux-0.1.13 \
sapp-wasm-0.1.26 \
sapp-windows-0.2.19 \
semver-0.9.0 \
semver-parser-0.7.0 \
serde-1.0.136 \
serde_derive-1.0.136 \
serde_json-1.0.79 \
sha1-0.6.1 \
ryu-1.0.11 \
same-file-1.0.6 \
scc-0.11.5 \
schannel-0.1.20 \
scoped-tls-1.0.1 \
scopeguard-1.1.0 \
sct-0.7.0 \
security-framework-2.7.0 \
security-framework-sys-2.6.1 \
self_cell-0.10.2 \
serde-1.0.147 \
serde_derive-1.0.147 \
serde_json-1.0.89 \
serde_yaml-0.9.14 \
sha1_smol-1.0.0 \
smallvec-0.6.14 \
spin-0.9.2 \
stdweb-0.4.20 \
stdweb-derive-0.5.3 \
stdweb-internal-macros-0.2.9 \
stdweb-internal-runtime-0.1.5 \
syn-1.0.86 \
toml-0.5.8 \
ttf-parser-0.12.3 \
unicode-xid-0.2.2 \
uuid-0.8.2 \
sharded-slab-0.1.4 \
shlex-1.1.0 \
signal-hook-registry-1.4.0 \
siphasher-0.2.3 \
slab-0.4.7 \
slotmap-1.0.6 \
smallvec-1.10.0 \
smithay-client-toolkit-0.15.4 \
socket2-0.4.7 \
spin-0.5.2 \
spirv-0.2.0+1.5.4 \
stdweb-0.1.3 \
str-buf-1.0.6 \
strsim-0.10.0 \
svg_fmt-0.4.1 \
svgtypes-0.5.0 \
symphonia-0.5.1 \
symphonia-codec-vorbis-0.5.1 \
symphonia-core-0.5.1 \
symphonia-format-ogg-0.5.1 \
symphonia-metadata-0.5.1 \
symphonia-utils-xiph-0.5.1 \
syn-1.0.103 \
synstructure-0.12.6 \
sys-locale-0.2.3 \
taffy-0.1.0 \
termcolor-1.1.3 \
thiserror-1.0.37 \
thiserror-impl-1.0.37 \
thread_local-1.1.4 \
tiff-0.6.1 \
time-0.3.17 \
time-core-0.1.0 \
tinystr-0.7.0 \
tinyvec-1.6.0 \
tinyvec_macros-0.1.0 \
tokio-1.22.0 \
tokio-macros-1.8.0 \
toml-0.5.9 \
tracing-0.1.37 \
tracing-attributes-0.1.23 \
tracing-core-0.1.30 \
tracing-log-0.1.3 \
tracing-subscriber-0.3.16 \
tracing-wasm-0.2.1 \
ttf-parser-0.17.1 \
turborand-0.8.1 \
type-map-0.4.0 \
typenum-1.15.0 \
ulid-1.0.0 \
unic-langid-0.9.1 \
unic-langid-impl-0.9.1 \
unicode-bidi-0.3.8 \
unicode-ident-1.0.5 \
unicode-normalization-0.1.22 \
unicode-width-0.1.10 \
unicode-xid-0.2.4 \
unsafe-libyaml-0.2.4 \
untrusted-0.7.1 \
url-2.3.1 \
uuid-1.2.2 \
valuable-0.1.0 \
varinteger-1.0.6 \
vec_map-0.8.2 \
version_check-0.9.4 \
wasi-0.10.2+wasi-snapshot-preview1 \
wasm-bindgen-0.2.79 \
wasm-bindgen-backend-0.2.79 \
wasm-bindgen-macro-0.2.79 \
wasm-bindgen-macro-support-0.2.79 \
wasm-bindgen-shared-0.2.79 \
web-sys-0.3.56 \
waker-fn-1.1.0 \
walkdir-2.3.2 \
wasi-0.11.0+wasi-snapshot-preview1 \
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 \
wayland-client-0.29.5 \
wayland-commons-0.29.5 \
wayland-cursor-0.29.5 \
wayland-protocols-0.29.5 \
wayland-scanner-0.29.5 \
wayland-sys-0.29.5 \
web-sys-0.3.60 \
webbrowser-0.7.1 \
webpki-0.22.0 \
weezl-0.1.7 \
wepoll-ffi-0.1.2 \
wgpu-0.13.1 \
wgpu-core-0.13.2 \
wgpu-hal-0.13.2 \
wgpu-types-0.13.2 \
widestring-0.5.1 \
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.5 \
winapi-wsapoll-0.1.1 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
fishsticks@git+https://github.com/fishfight/fishsticks\#95b45b717e427fb5fa1671f3bdf686d7270ad8a1
windows-sys-0.36.1 \
windows-sys-0.42.0 \
windows_aarch64_gnullvm-0.42.0 \
windows_aarch64_msvc-0.36.1 \
windows_aarch64_msvc-0.42.0 \
windows_i686_gnu-0.36.1 \
windows_i686_gnu-0.42.0 \
windows_i686_msvc-0.36.1 \
windows_i686_msvc-0.42.0 \
windows_x86_64_gnu-0.36.1 \
windows_x86_64_gnu-0.42.0 \
windows_x86_64_gnullvm-0.42.0 \
windows_x86_64_msvc-0.36.1 \
windows_x86_64_msvc-0.42.0 \
winit-0.26.1 \
x11-dl-2.20.0 \
x11rb-0.9.0 \
xcursor-0.3.4 \
xi-unicode-0.3.0 \
xml-rs-0.8.4 \
yasna-0.5.0 \
bevy_ggrs@git+https://github.com/zicklag/bevy_ggrs.git?branch=jumpy\#306683bbad3ed12e81175879a1ecb020d1873ea1 \
ggrs@git+https://github.com/gschup/ggrs\#3d4adea97ed5268d376cc44663e43c3a32359dbe \
bevy_ecs_dynamic@git+https://github.com/jakobhellermann/bevy_ecs_dynamic?rev=aa7a051a49bd134cfd8c169542e16526bf2b36b3\#aa7a051a49bd134cfd8c169542e16526bf2b36b3 \
bevy_hierarchy@git+https://github.com/zicklag/bevy.git?branch=dont-error-on-non-mapped-children-entities\#0db2b8e67b8cd848fdad2a98bebead4cfce6b336

File diff suppressed because it is too large Load diff

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
@@ -54,16 +54,16 @@ optional = true
[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")

View file

@ -1,187 +0,0 @@
https://github.com/not-fl3/miniquad/pull/270
error[E0428]: the name `GL_TIME_ELAPSED` is defined multiple times
--> cargo-crates/sapp-dummy-0.1.5/src/gl.rs:1455:1
|
922 | pub const GL_TIME_ELAPSED: u32 = 35007;
| --------------------------------------- previous definition of the value `GL_TIME_ELAPSED` here
...
1455 | pub const GL_TIME_ELAPSED: u32 = 35007;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `GL_TIME_ELAPSED` redefined here
|
= note: `GL_TIME_ELAPSED` must be defined only once in the value namespace of this module
--- cargo-crates/miniquad-0.3.0-alpha.42/Cargo.toml.orig 1970-01-01 00:00:01 UTC
+++ cargo-crates/miniquad-0.3.0-alpha.42/Cargo.toml
@@ -32,7 +32,7 @@ version = "0.1"
default = ["sapp-linux"]
kms = ["sapp-kms"]
log-impl = []
-[target."cfg(not(any(target_os=\"linux\", target_os=\"macos\", target_os=\"android\", target_os=\"ios\", target_arch=\"wasm32\", windows)))".dependencies.sapp-dummy]
+[target."cfg(not(any(target_os=\"linux\", target_os=\"dragonfly\", target_os=\"freebsd\", target_os=\"netbsd\", target_os=\"openbsd\", target_os=\"macos\", target_os=\"android\", target_os=\"ios\", target_arch=\"wasm32\", windows)))".dependencies.sapp-dummy]
version = "=0.1.5"
[target."cfg(target_arch = \"wasm32\")".dependencies.sapp-wasm]
version = "=0.1.26"
@@ -40,11 +40,11 @@ version = "=0.1.26"
version = "=0.1.14"
[target."cfg(target_os = \"ios\")".dependencies.sapp-ios]
version = "=0.1.2"
-[target."cfg(target_os = \"linux\")".dependencies.sapp-kms]
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dependencies.sapp-kms]
version = "=0.1.1"
optional = true
-[target."cfg(target_os = \"linux\")".dependencies.sapp-linux]
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dependencies.sapp-linux]
version = "=0.1.13"
optional = true
[target."cfg(target_os = \"macos\")".dependencies.sapp-darwin]
--- cargo-crates/miniquad-0.3.0-alpha.42/src/clipboard.rs.orig 1970-01-01 00:00:01 UTC
+++ cargo-crates/miniquad-0.3.0-alpha.42/src/clipboard.rs
@@ -2,7 +2,13 @@
use crate::Context;
-#[cfg(all(target_os = "linux", feature = "sapp-linux"))]
+#[cfg(all(feature = "sapp-linux", any(
+ target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
+)))]
mod linux_x11 {
use crate::Context;
@@ -53,7 +59,13 @@ mod windows {
}
#[cfg(not(any(
- all(target_os = "linux", feature = "sapp-linux"),
+ all(feature = "sapp-linux", any(
+ target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
+ )),
target_os = "windows",
target_arch = "wasm32"
)))]
@@ -68,12 +80,24 @@ mod dummy {
}
#[cfg(not(any(
- all(target_os = "linux", feature = "sapp-linux"),
+ all(feature = "sapp-linux", any(
+ target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
+ )),
target_os = "windows",
target_arch = "wasm32"
)))]
use dummy as clipboard;
-#[cfg(all(target_os = "linux", feature = "sapp-linux"))]
+#[cfg(all(feature = "sapp-linux", any(
+ target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
+)))]
use linux_x11 as clipboard;
#[cfg(target_arch = "wasm32")]
use wasm as clipboard;
--- cargo-crates/miniquad-0.3.0-alpha.42/src/lib.rs.orig 1970-01-01 00:00:01 UTC
+++ cargo-crates/miniquad-0.3.0-alpha.42/src/lib.rs
@@ -8,6 +8,10 @@ pub use sapp_android;
extern crate sapp_darwin as sapp;
#[cfg(not(any(
target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
target_os = "macos",
target_os = "ios",
target_os = "android",
@@ -17,9 +21,21 @@ extern crate sapp_darwin as sapp;
extern crate sapp_dummy as sapp;
#[cfg(target_os = "ios")]
extern crate sapp_ios as sapp;
-#[cfg(all(target_os = "linux", feature = "kms"))]
+#[cfg(all(feature = "kms", any(
+ target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
+)))]
extern crate sapp_kms as sapp;
-#[cfg(all(target_os = "linux", not(feature = "kms")))]
+#[cfg(all(not(feature = "kms"), any(
+ target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
+)))]
extern crate sapp_linux as sapp;
#[cfg(target_arch = "wasm32")]
@@ -139,7 +155,13 @@ impl Context {
pub fn set_mouse_cursor(&self, _cursor_icon: CursorIcon) {
#[cfg(any(
target_arch = "wasm32",
- all(target_os = "linux", not(feature = "kms")),
+ all(not(feature = "kms"), any(
+ target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
+ )),
windows,
))]
unsafe {
@@ -165,6 +187,10 @@ impl Context {
pub fn set_window_size(&self, new_width: u32, new_height: u32) {
#[cfg(not(any(
target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
target_os = "macos",
target_os = "ios",
target_os = "android",
@@ -184,6 +210,10 @@ impl Context {
pub fn set_fullscreen(&self, fullscreen: bool) {
#[cfg(not(any(
target_os = "linux",
+ target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "netbsd",
+ target_os = "openbsd",
target_os = "macos",
target_os = "ios",
target_os = "android",
--- cargo-crates/sapp-linux-0.1.13/build.rs.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/sapp-linux-0.1.13/build.rs
@@ -3,7 +3,12 @@ use std::env;
fn main() {
let target = env::var("TARGET").unwrap_or_else(|e| panic!("{}", e));
- if target.contains("linux") == false {
+ if target.contains("linux") == false
+ && target.contains("dragonfly") == false
+ && target.contains("freebsd") == false
+ && target.contains("netbsd") == false
+ && target.contains("openbsd") == false
+ {
panic!("sapp_linux support only linux target");
}

View file

@ -1,39 +0,0 @@
https://github.com/not-fl3/quad-snd/pull/36
error[E0432]: unresolved import `snd`
--> cargo-crates/quad-snd-0.2.3/src/lib.rs:32:9
|
32 | pub use snd::{AudioContext, Sound};
| ^^^ use of undeclared crate or module `snd`
|
help: there is a crate or module with a similar name
|
32 | pub use std::{AudioContext, Sound};
| ~~~
--- cargo-crates/quad-snd-0.2.3/Cargo.toml.orig 1970-01-01 00:00:01 UTC
+++ cargo-crates/quad-snd-0.2.3/Cargo.toml
@@ -22,10 +22,10 @@ features = ["wav", "ogg_vorbis"]
default-features = false
[target."cfg(target_os = \"android\")".dependencies.audir-sles]
version = "0.1.0"
-[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.quad-alsa-sys]
+[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.quad-alsa-sys]
version = "0.3.2"
[target."cfg(target_os = \"windows\")".dependencies.winapi]
version = "0.3.8"
--- cargo-crates/quad-snd-0.2.3/src/lib.rs.orig 1970-01-01 00:00:01 UTC
+++ cargo-crates/quad-snd-0.2.3/src/lib.rs
@@ -10,7 +10,7 @@ pub use error::Error;
#[path = "opensles_snd.rs"]
mod snd;
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
#[path = "alsa_snd.rs"]
mod snd;

View file

@ -0,0 +1,234 @@
https://github.com/quinn-rs/quinn/commit/166e0fb60a64
--- cargo-crates/quinn-0.9.1/src/connection.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/quinn-0.9.1/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.9.1/src/tests.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/quinn-0.9.1/src/tests.rs
@@ -462,7 +462,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.3.0/src/unix.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/quinn-udp-0.3.0/src/unix.rs
@@ -68,7 +68,7 @@ fn init(io: SockRef<'_>) -> io::Result<()> {
fn init(io: SockRef<'_>) -> 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 };
}
@@ -159,13 +159,20 @@ fn init(io: SockRef<'_>) -> 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 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 _,
)
@@ -175,12 +182,28 @@ fn init(io: SockRef<'_>) -> io::Result<()> {
}
}
}
+
+ // IPV6_RECVPKTINFO is standardized
if !is_ipv4 {
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 _,
@@ -195,11 +218,24 @@ fn send(
#[cfg(not(any(target_os = "macos", target_os = "ios")))]
fn send(
+ #[allow(unused_variables)] // only used on Linux
state: &UdpState,
io: SockRef<'_>,
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()?;
+ let is_ipv4 = addr.family() == libc::AF_INET as libc::sa_family_t;
+ if is_ipv4 {
+ if let Some(socket) = addr.as_socket_ipv4() {
+ encode_src_ip = socket.ip() == &Ipv4Addr::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];
@@ -225,13 +261,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 =
- unsafe { libc::sendmmsg(io.as_raw_fd(), msgs.as_mut_ptr(), num_transmits as u32, 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() {
@@ -287,9 +323,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();
@@ -336,7 +381,7 @@ fn recv(io: SockRef<'_>, bufs: &mut [IoSliceMut<'_>],
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 _,
0,
ptr::null_mut(),
)
@@ -396,6 +441,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();
@@ -427,9 +474,10 @@ fn prepare_msg(
}
if let Some(ip) = &transmit.src_ip {
- if cfg!(target_os = "linux") {
- match ip {
- IpAddr::V4(v4) => {
+ match ip {
+ IpAddr::V4(v4) => {
+ #[cfg(target_os = "linux")]
+ {
let pktinfo = libc::in_pktinfo {
ipi_ifindex: 0,
ipi_spec_dst: libc::in_addr {
@@ -439,16 +487,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);
+ }
}
}
@@ -499,11 +556,17 @@ fn decode_recv(
ecn_bits = cmsg::decode::<libc::c_int>(cmsg) as u8;
}
},
+ #[cfg(target_os = "linux")]
(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) };

View file

@ -0,0 +1,255 @@
https://github.com/bevyengine/bevy/issues/4106
--- Cargo.lock.orig 2022-12-14 03:55:03 UTC
+++ Cargo.lock
@@ -1177,6 +1177,16 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f471
checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
[[package]]
+name = "calloop"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82"
+dependencies = [
+ "log",
+ "nix 0.22.3",
+]
+
+[[package]]
name = "cc"
version = "1.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1646,6 +1656,15 @@ dependencies = [
]
[[package]]
+name = "dlib"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
name = "downcast-rs"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2785,6 +2804,15 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
+name = "memmap2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"
+dependencies = [
+ "libc",
+]
+
+[[package]]
name = "memoffset"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3019,6 +3047,7 @@ dependencies = [
"bitflags",
"cfg-if 1.0.0",
"libc",
+ "memoffset",
]
[[package]]
@@ -3847,6 +3876,12 @@ dependencies = [
]
[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3999,6 +4034,25 @@ dependencies = [
]
[[package]]
+name = "smithay-client-toolkit"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3"
+dependencies = [
+ "bitflags",
+ "calloop",
+ "dlib",
+ "lazy_static",
+ "log",
+ "memmap2",
+ "nix 0.22.3",
+ "pkg-config",
+ "wayland-client",
+ "wayland-cursor",
+ "wayland-protocols",
+]
+
+[[package]]
name = "socket2"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4622,6 +4676,78 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608
checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
[[package]]
+name = "wayland-client"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
+dependencies = [
+ "bitflags",
+ "downcast-rs",
+ "libc",
+ "nix 0.24.2",
+ "scoped-tls",
+ "wayland-commons",
+ "wayland-scanner",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-commons"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
+dependencies = [
+ "nix 0.24.2",
+ "once_cell",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
+dependencies = [
+ "nix 0.24.2",
+ "wayland-client",
+ "xcursor",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
+dependencies = [
+ "bitflags",
+ "wayland-client",
+ "wayland-commons",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "xml-rs",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
+dependencies = [
+ "dlib",
+ "pkg-config",
+]
+
+[[package]]
name = "web-sys"
version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4934,7 +5060,10 @@ dependencies = [
"parking_lot 0.11.2",
"percent-encoding",
"raw-window-handle",
+ "smithay-client-toolkit",
"wasm-bindgen",
+ "wayland-client",
+ "wayland-protocols",
"web-sys",
"winapi",
"x11-dl",
@@ -4964,10 +5093,25 @@ dependencies = [
]
[[package]]
+name = "xcursor"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
+dependencies = [
+ "nom",
+]
+
+[[package]]
name = "xi-unicode"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]]
name = "yasna"
--- Cargo.toml.orig 2022-12-14 03:55:03 UTC
+++ Cargo.toml
@@ -17,6 +17,7 @@ render = [
[features]
default = ["render"]
render = [
+ "bevy/wayland",
"bevy/x11",
"bevy/png",
"bevy/filesystem_watcher",
@@ -77,6 +78,7 @@ features = [
version = "0.8"
default-features = false
features = [
+ "wayland",
"x11",
"png",
"filesystem_watcher",
--- cargo-crates/bevy-0.8.1/Cargo.toml.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/bevy-0.8.1/Cargo.toml
@@ -1511,6 +1511,7 @@ default = [
"png",
"hdr",
"vorbis",
+ "wayland",
"x11",
"filesystem_watcher",
]
--- cargo-crates/bevy_winit-0.8.1/Cargo.toml.orig 1970-01-01 00:00:00 UTC
+++ cargo-crates/bevy_winit-0.8.1/Cargo.toml
@@ -53,7 +53,7 @@ default-features = false
default-features = false
[features]
-wayland = ["winit/wayland"]
+wayland = ["winit/wayland", "winit/wayland-dlopen"]
x11 = ["winit/x11"]
[target."cfg(target_arch = \"wasm32\")".dependencies.crossbeam-channel]