diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index 005fd99c5bc6..6ebc608e7fc7 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,81 +1,76 @@ PORTNAME= veloren PORTVERSION= s20250814 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly MAINTAINER= jbeich@FreeBSD.org COMMENT= Multiplayer voxel RPG written in Rust (weekly snapshot) WWW= https://veloren.net/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_i386= https://github.com/bytecodealliance/wasmtime/issues/7924 -ONLY_FOR_ARCHS= aarch64 amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= unsupported platform by https://github.com/wasmerio/wasmer LIB_DEPENDS= libzstd.so:archivers/zstd \ libasound.so:audio/alsa-lib \ libudev.so:devel/libudev-devd \ libshaderc_shared.so:graphics/shaderc \ libxkbcommon-x11.so:x11/libxkbcommon RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader USES= cargo xorg USE_XORG= xcb USE_GITLAB= yes GL_TAGNAME= v0.17.0-973-gec58a04dc1 # git describe --match='v[0-9]*' weekly CARGO_ENV= VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib" PLIST_FILES= bin/${PORTNAME}-server-cli \ bin/${PORTNAME}-voxygen \ share/applications/net.veloren.veloren.desktop \ share/metainfo/net.veloren.veloren.metainfo.xml \ share/pixmaps/net.veloren.veloren.png PORTDATA= * CONFLICTS_INSTALL= ${PORTNAME} -.if ${MACHINE_ARCH} == i386 -# https://github.com/rust-lang/rust/issues/85598 -CARGO_ENV+= CARGO_PROFILE_RELEASE_LTO=false -.endif # Fixes error "Instruction does not dominate all uses!" WITHOUT_LTO= yes # XXX bug 277333 # https://gitlab.com/veloren/veloren/issues/264 CARGO_ENV+= RUSTC_BOOTSTRAP=1 # XXX https://github.com/rust-lang/cargo/issues/4101 CARGO_INSTALL_PATH= server-cli voxygen post-patch: # .git/ directory is missing, so don't abort if git binary is also missing @${REINPLACE_CMD} -e 's/"git"/"${TRUE}"/' \ ${WRKSRC}/common/build.rs # Extract (snapshot) version from the port instead of empty file @${REINPLACE_CMD} -e '/GIT_HASH/s/=.*/= "${GL_TAGNAME:C/.*-g(.{8}).*/\1/}";/' \ -e "/GIT_DATE.*static/s/=.*/= \"$$(date -ur $$(${AWK} '/TIMESTAMP/ { print $$3 }' \ ${DISTINFO_FILE}) +'%Y-%m-%d-%H:%M')\";/" \ ${WRKSRC}/common/src/util/mod.rs # Respect PREFIX != /usr/local for system assets @${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/common/assets/src/lib.rs do-install: # XXX [workspace.dependencies] breaks rebuild in subdirs .for f in ${CARGO_INSTALL_PATH} ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/${PORTNAME}-$f \ ${STAGEDIR}${PREFIX}/bin .endfor post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} assets ${STAGEDIR}${DATADIR}) ${RLN} ${STAGEDIR}${DATADIR}/assets/voxygen/*.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${RLN} ${STAGEDIR}${DATADIR}/assets/voxygen/*.png \ ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo ${RLN} ${STAGEDIR}${DATADIR}/assets/voxygen/*.metainfo.xml \ ${STAGEDIR}${PREFIX}/share/metainfo .include diff --git a/games/veloren-weekly/files/patch-i386 b/games/veloren-weekly/files/patch-i386 deleted file mode 100644 index 2dd39fcca4b6..000000000000 --- a/games/veloren-weekly/files/patch-i386 +++ /dev/null @@ -1,28 +0,0 @@ -https://gitlab.com/veloren/veloren/-/merge_requests/4103 - -error[E0308]: mismatched types - --> rtsim/src/gen/mod.rs:30:43 - | -30 | let mut rng = SmallRng::from_seed(seed); - | ------------------- ^^^^ expected an array with a fixed size of 16 elements, found one with 32 elements - | | - | arguments to this function are incorrect - | -note: associated function defined here - --> cargo-crates/rand_core-0.6.4/src/lib.rs:319:8 - | -319 | fn from_seed(seed: Self::Seed) -> Self; - | ^^^^^^^^^ - ---- rtsim/src/gen/mod.rs.orig 2023-07-03 10:21:20 UTC -+++ rtsim/src/gen/mod.rs -@@ -23,6 +23,9 @@ impl Data { - - impl Data { - pub fn generate(settings: &WorldSettings, world: &World, index: IndexRef) -> Self { -+#[cfg(target_pointer_width = "32")] -+ let mut seed = [0; 16]; -+#[cfg(not(target_pointer_width = "32"))] - let mut seed = [0; 32]; - seed.iter_mut() - .zip(&mut index.seed.to_le_bytes())