git: 40b80af5fee0 - main - games/jumpy: fix build on powerpc*, probably also armv7 and aarch64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 31 Dec 2024 14:00:49 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=40b80af5fee0cefa1c2b33da129d50c0b8b4d3b7
commit 40b80af5fee0cefa1c2b33da129d50c0b8b4d3b7
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-12-31 10:28:31 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2024-12-31 13:59:57 +0000
games/jumpy: fix build on powerpc*, probably also armv7 and aarch64
All powerpc*, armv7 and aarch64 use unsigned char.
---
games/jumpy/Makefile | 3 ---
.../patch-cargo-crates_netdev-0.30.0_src_interface_unix.rs | 13 +++++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/games/jumpy/Makefile b/games/jumpy/Makefile
index 1f38b3a671fb..e7d33d458148 100644
--- a/games/jumpy/Makefile
+++ b/games/jumpy/Makefile
@@ -13,9 +13,6 @@ LICENSE_COMB= multi
LICENSE_FILE_MIT= ${WRKSRC}/licenses/LICENSE-MIT
LICENSE_DISTFILES_CC-BY-NC-4.0= ${DISTNAME}${EXTRACT_SUFX}
-BROKEN_aarch64= need https://github.com/shellrow/netdev/pull/71
-BROKEN_armv7= need https://github.com/shellrow/netdev/pull/71
-
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 \
diff --git a/games/jumpy/files/patch-cargo-crates_netdev-0.30.0_src_interface_unix.rs b/games/jumpy/files/patch-cargo-crates_netdev-0.30.0_src_interface_unix.rs
new file mode 100644
index 000000000000..6b1c52b14dda
--- /dev/null
+++ b/games/jumpy/files/patch-cargo-crates_netdev-0.30.0_src_interface_unix.rs
@@ -0,0 +1,13 @@
+--- cargo-crates/netdev-0.30.0/src/interface/unix.rs.orig 2024-12-27 16:28:59 UTC
++++ cargo-crates/netdev-0.30.0/src/interface/unix.rs
+@@ -189,8 +189,8 @@ fn sockaddr_to_network_addr(sa: *mut libc::sockaddr) -
+ if sa.is_null() {
+ (None, None)
+ } else if (*sa).sa_family as libc::c_int == libc::AF_LINK {
+- let nlen: i8 = (*sa).sa_data[3];
+- let alen: i8 = (*sa).sa_data[4];
++ let nlen: c_char = (*sa).sa_data[3];
++ let alen: c_char = (*sa).sa_data[4];
+ if alen > 0 && alen as u8 + nlen as u8 + 8 <= (*sa).sa_len {
+ let ptr = (*sa).sa_data.as_mut_ptr();
+ let extended =