Date: Thu, 24 Aug 2023 00:35:46 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: cdf0ecca10dc - 2023Q3 - games/veloren-weekly: update to s20230823 Message-ID: <202308240035.37O0ZkwW020277@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdf0ecca10dcc67326271d17a1f0a3be4cdde391 commit cdf0ecca10dcc67326271d17a1f0a3be4cdde391 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-08-23 10:01:52 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-08-24 00:35:05 +0000 games/veloren-weekly: update to s20230823 Changes: https://gitlab.com/veloren/veloren/-/compare/c9da8fb6a...5195f6aac (cherry picked from commit 36423478e7bea39be91e8ccb505de5b69999b2e0) --- games/veloren-weekly/Makefile | 4 +- games/veloren-weekly/Makefile.crates | 25 ++-- games/veloren-weekly/distinfo | 56 ++++---- games/veloren-weekly/files/patch-quinn | 231 --------------------------------- 4 files changed, 35 insertions(+), 281 deletions(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index d9338855cb74..456d262c9aa8 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,5 +1,5 @@ PORTNAME= veloren -PORTVERSION= s20230817 +PORTVERSION= s20230823 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly @@ -24,7 +24,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl USES= cargo xorg USE_XORG= xcb USE_GITLAB= yes -GL_COMMIT= c9da8fb6a426b19c70e4a34872ae0a7a79cd1293 +GL_COMMIT= 5195f6aaca33dbc336d949ca25c3b07ad4029f16 CARGO_ENV= VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib" PLIST_FILES= bin/${PORTNAME}-server-cli \ bin/${PORTNAME}-voxygen \ diff --git a/games/veloren-weekly/Makefile.crates b/games/veloren-weekly/Makefile.crates index 43b91b952ea0..c4d80fec033f 100644 --- a/games/veloren-weekly/Makefile.crates +++ b/games/veloren-weekly/Makefile.crates @@ -140,7 +140,6 @@ CARGO_CRATES= ab_glyph-0.2.21 \ crypto-common-0.1.6 \ csv-1.2.1 \ csv-core-0.1.10 \ - ct-logs-0.8.0 \ cty-0.2.2 \ cxx-1.0.94 \ cxx-build-1.0.94 \ @@ -272,7 +271,7 @@ CARGO_CRATES= ab_glyph-0.2.21 \ httpdate-1.0.2 \ humantime-2.1.0 \ hyper-0.14.26 \ - hyper-rustls-0.22.1 \ + hyper-rustls-0.24.1 \ iana-time-zone-0.1.56 \ iana-time-zone-haiku-0.1.1 \ id-arena-2.2.1 \ @@ -379,6 +378,7 @@ CARGO_CRATES= ab_glyph-0.2.21 \ num-complex-0.2.4 \ num-complex-0.4.3 \ num-derive-0.3.3 \ + num-derive-0.4.0 \ num-integer-0.1.45 \ num-iter-0.1.43 \ num-rational-0.2.4 \ @@ -453,9 +453,9 @@ CARGO_CRATES= ab_glyph-0.2.21 \ ptr_meta_derive-0.1.4 \ pulldown-cmark-0.8.0 \ quick-xml-0.28.2 \ - quinn-0.8.5 \ - quinn-proto-0.8.4 \ - quinn-udp-0.1.4 \ + quinn-0.10.2 \ + quinn-proto-0.10.3 \ + quinn-udp-0.4.1 \ quote-0.6.13 \ quote-1.0.26 \ radium-0.7.0 \ @@ -509,12 +509,10 @@ CARGO_CRATES= ab_glyph-0.2.21 \ rustc_version-0.2.3 \ rustc_version-0.4.0 \ rustix-0.37.19 \ - rustls-0.19.1 \ - rustls-0.20.8 \ - rustls-native-certs-0.5.0 \ + rustls-0.21.6 \ rustls-native-certs-0.6.2 \ - rustls-pemfile-0.2.1 \ rustls-pemfile-1.0.2 \ + rustls-webpki-0.101.4 \ rusttype-0.7.9 \ rusttype-0.8.3 \ rusttype-0.9.3 \ @@ -527,7 +525,6 @@ CARGO_CRATES= ab_glyph-0.2.21 \ scoped-tls-1.0.1 \ scopeguard-1.1.0 \ scratch-1.0.5 \ - sct-0.6.1 \ sct-0.7.0 \ sdl2-0.35.2 \ sdl2-sys-0.35.2 \ @@ -623,9 +620,9 @@ CARGO_CRATES= ab_glyph-0.2.21 \ tinytemplate-1.2.1 \ tinyvec-1.6.0 \ tinyvec_macros-0.1.1 \ - tokio-1.28.0 \ + tokio-1.28.2 \ tokio-macros-2.1.0 \ - tokio-rustls-0.22.0 \ + tokio-rustls-0.24.1 \ tokio-stream-0.1.14 \ tokio-util-0.7.1 \ toml-0.5.11 \ @@ -715,8 +712,6 @@ CARGO_CRATES= ab_glyph-0.2.21 \ wayland-sys-0.28.6 \ wayland-sys-0.29.5 \ web-sys-0.3.50 \ - webpki-0.21.4 \ - webpki-0.22.0 \ wfd-0.1.7 \ which-4.4.0 \ winapi-0.3.9 \ @@ -779,9 +774,9 @@ CARGO_CRATES= ab_glyph-0.2.21 \ yasna-0.5.2 \ 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 \ + auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=42dddd666f28e1a94cdf4b542fcd61f67658e261\#42dddd666f28e1a94cdf4b542fcd61f67658e261 \ ntapi@git+https://github.com/MSxDOS/ntapi.git?rev=9f56b149c9e25796739157c0fce3e0007a7de6eb\#9f56b149c9e25796739157c0fce3e0007a7de6eb \ 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 \ conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#59fddc617696e68d28a75c2137a08c2572efb986 \ naga@git+https://github.com/gfx-rs/naga?tag=gfx-25\#057d03ad86f18e3bb3866b20901d8d4e892dd3d6 \ diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo index 8ff987680994..bdb76e5f5c1d 100644 --- a/games/veloren-weekly/distinfo +++ b/games/veloren-weekly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1692269311 +TIMESTAMP = 1692784912 SHA256 (rust/crates/ab_glyph-0.2.21.crate) = 5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39 SIZE (rust/crates/ab_glyph-0.2.21.crate) = 17764 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046 @@ -283,8 +283,6 @@ SHA256 (rust/crates/csv-1.2.1.crate) = 0b015497079b9a9d69c02ad25de6c0a6edef051ea SIZE (rust/crates/csv-1.2.1.crate) = 887936 SHA256 (rust/crates/csv-core-0.1.10.crate) = 2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90 SIZE (rust/crates/csv-core-0.1.10.crate) = 25668 -SHA256 (rust/crates/ct-logs-0.8.0.crate) = c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8 -SIZE (rust/crates/ct-logs-0.8.0.crate) = 19766 SHA256 (rust/crates/cty-0.2.2.crate) = b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35 SIZE (rust/crates/cty-0.2.2.crate) = 7230 SHA256 (rust/crates/cxx-1.0.94.crate) = f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93 @@ -547,8 +545,8 @@ SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec8 SIZE (rust/crates/humantime-2.1.0.crate) = 16749 SHA256 (rust/crates/hyper-0.14.26.crate) = ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4 SIZE (rust/crates/hyper-0.14.26.crate) = 195570 -SHA256 (rust/crates/hyper-rustls-0.22.1.crate) = 5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64 -SIZE (rust/crates/hyper-rustls-0.22.1.crate) = 26718 +SHA256 (rust/crates/hyper-rustls-0.24.1.crate) = 8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97 +SIZE (rust/crates/hyper-rustls-0.24.1.crate) = 30224 SHA256 (rust/crates/iana-time-zone-0.1.56.crate) = 0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c SIZE (rust/crates/iana-time-zone-0.1.56.crate) = 19517 SHA256 (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca @@ -761,6 +759,8 @@ SHA256 (rust/crates/num-complex-0.4.3.crate) = 02e0d21255c828d6f128a1e4153420667 SIZE (rust/crates/num-complex-0.4.3.crate) = 29523 SHA256 (rust/crates/num-derive-0.3.3.crate) = 876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d SIZE (rust/crates/num-derive-0.3.3.crate) = 14545 +SHA256 (rust/crates/num-derive-0.4.0.crate) = 9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e +SIZE (rust/crates/num-derive-0.4.0.crate) = 14008 SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9 SIZE (rust/crates/num-integer-0.1.45.crate) = 22529 SHA256 (rust/crates/num-iter-0.1.43.crate) = 7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252 @@ -909,12 +909,12 @@ SHA256 (rust/crates/pulldown-cmark-0.8.0.crate) = ffade02495f22453cd593159ea2f59 SIZE (rust/crates/pulldown-cmark-0.8.0.crate) = 106330 SHA256 (rust/crates/quick-xml-0.28.2.crate) = 0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1 SIZE (rust/crates/quick-xml-0.28.2.crate) = 156462 -SHA256 (rust/crates/quinn-0.8.5.crate) = 5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f -SIZE (rust/crates/quinn-0.8.5.crate) = 51837 -SHA256 (rust/crates/quinn-proto-0.8.4.crate) = 3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55 -SIZE (rust/crates/quinn-proto-0.8.4.crate) = 150422 -SHA256 (rust/crates/quinn-udp-0.1.4.crate) = b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54 -SIZE (rust/crates/quinn-udp-0.1.4.crate) = 8841 +SHA256 (rust/crates/quinn-0.10.2.crate) = 8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75 +SIZE (rust/crates/quinn-0.10.2.crate) = 59964 +SHA256 (rust/crates/quinn-proto-0.10.3.crate) = b83c2a964b8b68e6c9c616f09b735b436a78843704fa6979a076073e622f69dc +SIZE (rust/crates/quinn-proto-0.10.3.crate) = 165984 +SHA256 (rust/crates/quinn-udp-0.4.1.crate) = 055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7 +SIZE (rust/crates/quinn-udp-0.4.1.crate) = 12467 SHA256 (rust/crates/quote-0.6.13.crate) = 6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1 SIZE (rust/crates/quote-0.6.13.crate) = 17475 SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc @@ -1021,18 +1021,14 @@ SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175 SHA256 (rust/crates/rustix-0.37.19.crate) = acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d SIZE (rust/crates/rustix-0.37.19.crate) = 323809 -SHA256 (rust/crates/rustls-0.19.1.crate) = 35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7 -SIZE (rust/crates/rustls-0.19.1.crate) = 208143 -SHA256 (rust/crates/rustls-0.20.8.crate) = fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f -SIZE (rust/crates/rustls-0.20.8.crate) = 270142 -SHA256 (rust/crates/rustls-native-certs-0.5.0.crate) = 5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092 -SIZE (rust/crates/rustls-native-certs-0.5.0.crate) = 18482 +SHA256 (rust/crates/rustls-0.21.6.crate) = 1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb +SIZE (rust/crates/rustls-0.21.6.crate) = 282907 SHA256 (rust/crates/rustls-native-certs-0.6.2.crate) = 0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50 SIZE (rust/crates/rustls-native-certs-0.6.2.crate) = 22089 -SHA256 (rust/crates/rustls-pemfile-0.2.1.crate) = 5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9 -SIZE (rust/crates/rustls-pemfile-0.2.1.crate) = 14278 SHA256 (rust/crates/rustls-pemfile-1.0.2.crate) = d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b SIZE (rust/crates/rustls-pemfile-1.0.2.crate) = 19347 +SHA256 (rust/crates/rustls-webpki-0.101.4.crate) = 7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d +SIZE (rust/crates/rustls-webpki-0.101.4.crate) = 164324 SHA256 (rust/crates/rusttype-0.7.9.crate) = 310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5 SIZE (rust/crates/rusttype-0.7.9.crate) = 42732 SHA256 (rust/crates/rusttype-0.8.3.crate) = 9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0 @@ -1057,8 +1053,6 @@ SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab1 SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 SHA256 (rust/crates/scratch-1.0.5.crate) = 1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1 SIZE (rust/crates/scratch-1.0.5.crate) = 8013 -SHA256 (rust/crates/sct-0.6.1.crate) = b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce -SIZE (rust/crates/sct-0.6.1.crate) = 26825 SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4 SIZE (rust/crates/sct-0.7.0.crate) = 27502 SHA256 (rust/crates/sdl2-0.35.2.crate) = f7959277b623f1fb9e04aea73686c3ca52f01b2145f8ea16f4ff30d8b7623b1a @@ -1249,12 +1243,12 @@ SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a465126 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865 -SHA256 (rust/crates/tokio-1.28.0.crate) = c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f -SIZE (rust/crates/tokio-1.28.0.crate) = 660469 +SHA256 (rust/crates/tokio-1.28.2.crate) = 94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2 +SIZE (rust/crates/tokio-1.28.2.crate) = 660565 SHA256 (rust/crates/tokio-macros-2.1.0.crate) = 630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e SIZE (rust/crates/tokio-macros-2.1.0.crate) = 11472 -SHA256 (rust/crates/tokio-rustls-0.22.0.crate) = bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6 -SIZE (rust/crates/tokio-rustls-0.22.0.crate) = 22706 +SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081 +SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049 SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842 SIZE (rust/crates/tokio-stream-0.1.14.crate) = 35881 SHA256 (rust/crates/tokio-util-0.7.1.crate) = 0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764 @@ -1433,10 +1427,6 @@ SHA256 (rust/crates/wayland-sys-0.29.5.crate) = be12ce1a3c39ec7dba25594b97b42cb3 SIZE (rust/crates/wayland-sys-0.29.5.crate) = 7926 SHA256 (rust/crates/web-sys-0.3.50.crate) = a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be SIZE (rust/crates/web-sys-0.3.50.crate) = 650100 -SHA256 (rust/crates/webpki-0.21.4.crate) = b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea -SIZE (rust/crates/webpki-0.21.4.crate) = 58505 -SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd -SIZE (rust/crates/webpki-0.22.0.crate) = 58663 SHA256 (rust/crates/wfd-0.1.7.crate) = e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8 SIZE (rust/crates/wfd-0.1.7.crate) = 8825 SHA256 (rust/crates/which-4.4.0.crate) = 2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269 @@ -1561,12 +1551,12 @@ SHA256 (Imberflur-wgpu-profiler-wgpu-0.8_GH0.tar.gz) = e30fa6d177db9c77c8f938a0b SIZE (Imberflur-wgpu-profiler-wgpu-0.8_GH0.tar.gz) = 14759 SHA256 (fdehau-tui-rs-54b841fab6cfdb38e8dc1382176e965787964b4c_GH0.tar.gz) = 920e26b3816975b77f9111206aec5859560141e222bef2d539c05894798ac4ba SIZE (fdehau-tui-rs-54b841fab6cfdb38e8dc1382176e965787964b4c_GH0.tar.gz) = 1531288 +SHA256 (veloren-auth-42dddd666f28e1a94cdf4b542fcd61f67658e261_GL0.tar.gz) = 87bc93ff55fede4f21deb436d382cef06d030c11d773d4800cfd6a00b20a662b +SIZE (veloren-auth-42dddd666f28e1a94cdf4b542fcd61f67658e261_GL0.tar.gz) = 34296 SHA256 (MSxDOS-ntapi-9f56b149c9e25796739157c0fce3e0007a7de6eb_GH0.tar.gz) = 8fb5cffa8c7196189f5cf4483275c803598620cc6e03fdc875102f7fa3986767 SIZE (MSxDOS-ntapi-9f56b149c9e25796739157c0fce3e0007a7de6eb_GH0.tar.gz) = 186924 SHA256 (juliancoffee-fluent-rs-929cf9512de121cce9b4cbf1cb860cd3294a1cd9_GH0.tar.gz) = b1666caeb396b844788a732346e8ab6e555190978efe7a6386469040959acebf SIZE (juliancoffee-fluent-rs-929cf9512de121cce9b4cbf1cb860cd3294a1cd9_GH0.tar.gz) = 351345 -SHA256 (veloren-auth-fb3dcbc4962b367253f8f2f92760ef44d2679c9a_GL0.tar.gz) = b2d4945ddb39ad719985b189fb720350ab86df94332f362a0e4477d7a2a774a3 -SIZE (veloren-auth-fb3dcbc4962b367253f8f2f92760ef44d2679c9a_GL0.tar.gz) = 34375 SHA256 (Imberflur-iced-winit-0.25_GH0.tar.gz) = 28a51922c4a44a17619ad18211004358b818cb4294e87b0369891d1f55a58b7a SIZE (Imberflur-iced-winit-0.25_GH0.tar.gz) = 1130464 SHA256 (veloren-conrod-59fddc617696e68d28a75c2137a08c2572efb986_GL0.tar.gz) = a71e234ebe79beb46beee4981fbb7b2f165a3d41a043faf80248f5e7083577fa @@ -1583,5 +1573,5 @@ SHA256 (hasenbanck-egui_wgpu_backend-63a002c6a9b6c016e45806dd065864431caab621_GH SIZE (hasenbanck-egui_wgpu_backend-63a002c6a9b6c016e45806dd065864431caab621_GH0.tar.gz) = 11500 SHA256 (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = f6fc0b8e9b1290729ea94865be84a8c47846e49e3c193dab700940e1452d2fed SIZE (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = 90485 -SHA256 (veloren-veloren-c9da8fb6a426b19c70e4a34872ae0a7a79cd1293_GL0.tar.gz) = 7153acd8e11023006738f4eb3eec92e5aade5c5e3e8712838aeaf9b7028d75da -SIZE (veloren-veloren-c9da8fb6a426b19c70e4a34872ae0a7a79cd1293_GL0.tar.gz) = 269461585 +SHA256 (veloren-veloren-5195f6aaca33dbc336d949ca25c3b07ad4029f16_GL0.tar.gz) = 8f102b2ef5042e282653c56c8506f2721b2841ca08f264d46a80b45518136a96 +SIZE (veloren-veloren-5195f6aaca33dbc336d949ca25c3b07ad4029f16_GL0.tar.gz) = 269723745 diff --git a/games/veloren-weekly/files/patch-quinn b/games/veloren-weekly/files/patch-quinn deleted file mode 100644 index 7e6b0ccf5afd..000000000000 --- a/games/veloren-weekly/files/patch-quinn +++ /dev/null @@ -1,231 +0,0 @@ -https://github.com/quinn-rs/quinn/commit/166e0fb60a64 - ---- 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.4/src/unix.rs.orig 1970-01-01 00:00:00 UTC -+++ cargo-crates/quinn-udp-0.1.4/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 }; - } -@@ -179,13 +179,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 _, - ) -@@ -195,12 +202,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 _, -@@ -215,11 +238,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]; -@@ -245,13 +278,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() { -@@ -307,9 +340,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(); -@@ -360,7 +402,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 _, - 0, - std::ptr::null_mut(), - ) -@@ -423,6 +465,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(); -@@ -454,9 +498,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 { -@@ -466,16 +511,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); -+ } - } - } - -@@ -524,11 +578,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) };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308240035.37O0ZkwW020277>