CVS commit: pkgsrc/emulators/fbneo

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Feb 22 19:37:36 UTC 2025

Modified Files:
        pkgsrc/emulators/fbneo: Makefile distinfo
        pkgsrc/emulators/fbneo/patches: patch-src_burn_burnint.h

Log Message:
emulators/fbneo: fix build on NetBSD-*-aarch64

Patch provided by adr in
https://mail-index.netbsd.org/pkgsrc-users/2025/02/11/msg041061.html


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/fbneo/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/fbneo/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/fbneo/patches/patch-src_burn_burnint.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/fbneo/Makefile
diff -u pkgsrc/emulators/fbneo/Makefile:1.5 pkgsrc/emulators/fbneo/Makefile:1.6
--- pkgsrc/emulators/fbneo/Makefile:1.5 Wed Feb 12 06:44:43 2025
+++ pkgsrc/emulators/fbneo/Makefile     Sat Feb 22 19:37:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2025/02/12 06:44:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2025/02/22 19:37:36 rillig Exp $
 
 DISTNAME=      FBNeo-1.0.0.2
 PKGNAME=       ${DISTNAME:tl}
@@ -32,10 +32,14 @@ REPLACE_PERL+=      src/dep/scripts/*.pl
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-MAKE_FLAGS+=   LSB_FIRST=1
 TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
 .endif
 
+.include "../../mk/endian.mk"
+.if ${MACHINE_ENDIAN} == "little"
+MAKE_FLAGS+=   LSB_FIRST=1
+.endif
+
 LDFLAGS+=      -lpng -lz
 
 MAKE_JOBS_SAFE=        no

Index: pkgsrc/emulators/fbneo/distinfo
diff -u pkgsrc/emulators/fbneo/distinfo:1.1 pkgsrc/emulators/fbneo/distinfo:1.2
--- pkgsrc/emulators/fbneo/distinfo:1.1 Mon May 29 19:30:47 2023
+++ pkgsrc/emulators/fbneo/distinfo     Sat Feb 22 19:37:36 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2023/05/29 19:30:47 nia Exp $
+$NetBSD: distinfo,v 1.2 2025/02/22 19:37:36 rillig Exp $
 
 BLAKE2s (FBNeo-1.0.0.2.tar.gz) = 53db8d6df7bffe800159d529867168889742523f9db6196972343f9a78a46b35
 SHA512 (FBNeo-1.0.0.2.tar.gz) = 5ba58d89e3f119a3521e9ba4278ca85b818912a11663be3e1aa1ab80a03fc8b76974709232c1dc27f5e5877db251d6878f7c0b9bc9e4ae4ab583a12bd617b98b
 Size (FBNeo-1.0.0.2.tar.gz) = 12171430 bytes
 SHA1 (patch-makefile) = 94c77fe8b5c8f7b924c507d7b327f9ef25bb3409
 SHA1 (patch-makefile.sdl2) = a41b13f31faccf2e6bb075290f926fb64ca7b1d5
-SHA1 (patch-src_burn_burnint.h) = 1050d2088c17b0763c47fef6a0674b5eb94b7ba6
+SHA1 (patch-src_burn_burnint.h) = eb63708ff70aa8274b8eb6601aa62aa94ea640e6
 SHA1 (patch-src_burner_burner.h) = a09ded507381d6f2bb9d4476813122a53415c01d

Index: pkgsrc/emulators/fbneo/patches/patch-src_burn_burnint.h
diff -u pkgsrc/emulators/fbneo/patches/patch-src_burn_burnint.h:1.1 pkgsrc/emulators/fbneo/patches/patch-src_burn_burnint.h:1.2
--- pkgsrc/emulators/fbneo/patches/patch-src_burn_burnint.h:1.1 Mon May 29 19:30:48 2023
+++ pkgsrc/emulators/fbneo/patches/patch-src_burn_burnint.h     Sat Feb 22 19:37:36 2025
@@ -1,9 +1,20 @@
-$NetBSD: patch-src_burn_burnint.h,v 1.1 2023/05/29 19:30:48 nia Exp $
+$NetBSD: patch-src_burn_burnint.h,v 1.2 2025/02/22 19:37:36 rillig Exp $
 
 Teach fbneo about endian on NetBSD.
 
 --- src/burn/burnint.h.orig    2021-05-01 20:32:23.000000000 +0000
 +++ src/burn/burnint.h
+@@ -30,8 +30,8 @@ typedef union
+ #define BURN_ENDIAN_SWAP_INT64(x)                             x
+ #else
+ 
+-// Xbox 360 has byteswap 64-bit intrinsic
+-#ifndef _XBOX
++// Xbox 360 and NetBSD have byteswap 64-bit intrinsic
++#if !definded(_XBOX) && !defined(__NetBSD__)
+ #define NO_64BIT_BYTESWAP
+ #endif
+ 
 @@ -80,6 +80,13 @@ typedef union {
  #define BURN_ENDIAN_SWAP_INT8(x)                              (x^1)
  #define BURN_ENDIAN_SWAP_INT16(x)                             ({uint16_t tt; __sthbrx(&tt, 0, x); tt;})