Mon May 29 14:33:14 2023 UTC ()
libretro-fbneo: Update to 20230524

Lots of support for new exciting arcade systems, like Cave CV1000 and
Sega System 32.


(nia)
diff -r1.3 -r1.4 pkgsrc/emulators/libretro-fbneo/Makefile
diff -r1.6 -r1.7 pkgsrc/emulators/libretro-fbneo/distinfo
diff -r0 -r1.1 pkgsrc/emulators/libretro-fbneo/patches/patch-src_burn_burn__endian.h
diff -r1.1 -r0 pkgsrc/emulators/libretro-fbneo/patches/patch-src_burner_libretro_burn__endian.h
diff -r1.2 -r1.3 pkgsrc/emulators/libretro-fbneo/patches/patch-src_burner_libretro_retro__common.h
cvs diff -r1.3 -r1.4 pkgsrc/emulators/libretro-fbneo/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-fbneo/Makefile 2020/08/11 18:47:39 1.3
+++ pkgsrc/emulators/libretro-fbneo/Makefile 2023/05/29 14:33:14 1.4
@@ -1,37 +1,45 @@ @@ -1,37 +1,45 @@
1# $NetBSD: Makefile,v 1.3 2020/08/11 18:47:39 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2023/05/29 14:33:14 nia Exp $
2 2
3DISTNAME= libretro-fbneo-20200530 3FBNEO_TAG= 98e3e5eba0f45cce06c11cc7f9065ddb23ece3e1
 4DISTNAME= FBNeo-${FBNEO_TAG}
 5PKGNAME= libretro-fbneo-20230524
4CATEGORIES= emulators 6CATEGORIES= emulators
5GITHUB_PROJECT= FBNeo 7GITHUB_PROJECT= FBNeo
6GITHUB_TAG= 301cf7b6eeb3e7683952b98b66f39008f580b26d 8MASTER_SITES= https://git.libretro.com/libretro/FBNeo/-/archive/${FBNEO_TAG}/
7 9
8MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/libretro/FBNeo/tree/master/src/burner/libretro 11HOMEPAGE= https://git.libretro.com/libretro/FBNeo/-/tree/master/src/burner/libretro
10COMMENT= Libretro core based on the FinalBurn Neo arcade game emulator 12COMMENT= Libretro core based on the FinalBurn Neo arcade game emulator
11LICENSE= fbalpha-license 13LICENSE= fbalpha-license
12 14
13SUPERSEDES+= libretro-fbalpha-[0-9]* 15SUPERSEDES+= libretro-fbalpha-[0-9]*
14 16
15UNLIMIT_RESOURCES+= datasize virtualsize 17UNLIMIT_RESOURCES+= datasize virtualsize
16 18
17BUILD_DIRS= src/burner/libretro 19BUILD_DIRS= src/burner/libretro
18USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
19 21
20LIBRETRO_CORE= fbneo 22LIBRETRO_CORE= fbneo
21 23
22MAKE_FLAGS+= EXTERNAL_ZLIB=1 24MAKE_FLAGS+= EXTERNAL_ZLIB=1
23 25
24.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
25 27
26.if ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf" 28.if ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf"
27MAKE_FLAGS+= USE_CYCLONE=1 29MAKE_FLAGS+= USE_CYCLONE=1
 30MAKE_FLAGS+= ENDIANNESS_DEFINES=-DLSB_FIRST
 31.elif ${MACHINE_ARCH} == "aarch64"
 32MAKE_FLAGS+= ENDIANNESS_DEFINES=-DLSB_FIRST
28.elif ${MACHINE_ARCH} == "x86_64" 33.elif ${MACHINE_ARCH} == "x86_64"
29MAKE_FLAGS+= USE_X64_DRC=1 34MAKE_FLAGS+= USE_X64_DRC=1
 35MAKE_FLAGS+= ENDIANNESS_DEFINES=-DLSB_FIRST
 36.elif ${MACHINE_ARCH} == "i386"
 37MAKE_FLAGS+= ENDIANNESS_DEFINES=-DLSB_FIRST
30.endif 38.endif
31 39
32BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-no-undefined 40BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-no-undefined
33BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=../../burner/libretro/link.T 41BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=../../burner/libretro/link.T
34 42
35.include "../../emulators/retroarch/core.mk" 43.include "../../emulators/retroarch/core.mk"
36.include "../../devel/zlib/buildlink3.mk" 44.include "../../devel/zlib/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/emulators/libretro-fbneo/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-fbneo/distinfo 2021/10/26 10:23:54 1.6
+++ pkgsrc/emulators/libretro-fbneo/distinfo 2023/05/29 14:33:14 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2021/10/26 10:23:54 nia Exp $ 1$NetBSD: distinfo,v 1.7 2023/05/29 14:33:14 nia Exp $
2 2
3BLAKE2s (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = a5b046fd82aceb1d85c03e8cace1dfd52a939bcd9407b2bda24f05bd9a11ad83 3BLAKE2s (FBNeo-98e3e5eba0f45cce06c11cc7f9065ddb23ece3e1.tar.gz) = 3cfeb43d9db1f1c51bd926f98ab2b9d2085ea389bea641fad2c12fde717c823e
4SHA512 (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = 0ef4a27bd9fa0d49f5ea09777f2144a9b0be9c9fced59593ba15e9f4818a305d2ca85a2ef3850cef77032157265376f5f3204b6c81226001c94d85f346829843 4SHA512 (FBNeo-98e3e5eba0f45cce06c11cc7f9065ddb23ece3e1.tar.gz) = 0fafd3cc6fc6876920be2486f85c091fb9e9fdeab29196e0157a347a4aad600880b47c46fc12cef52387a64fc8284230a38934937b00b0bd4c2c526b19d9e5c2
5Size (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = 14602038 bytes 5Size (FBNeo-98e3e5eba0f45cce06c11cc7f9065ddb23ece3e1.tar.gz) = 18535308 bytes
6SHA1 (patch-src_burner_libretro_burn__endian.h) = 35b3ea13154bd5380ad5d067f3ec5f32ab18ce36 6SHA1 (patch-src_burn_burn__endian.h) = ce5f14cc5c349a0bc1ec56ea1310e8ef1086ec64
7SHA1 (patch-src_burner_libretro_retro__common.h) = 5bb4c3ff577841e1c89e689a272ad4a188cba5d4 7SHA1 (patch-src_burner_libretro_retro__common.h) = d0b25d0582223cf2a1bf3b4cd0b08c02e8786e30
File Added: pkgsrc/emulators/libretro-fbneo/patches/patch-src_burn_burn__endian.h
$NetBSD: patch-src_burn_burn__endian.h,v 1.1 2023/05/29 14:33:14 nia Exp $

More than games consoles are big endian.

--- src/burn/burn_endian.h.orig	2023-05-24 08:09:39.000000000 +0000
+++ src/burn/burn_endian.h
@@ -41,6 +41,13 @@ typedef union {
 #define BURN_ENDIAN_SWAP_INT16(x)				({uint16_t tt; __sthbrx(&tt, x); tt;})
 #define BURN_ENDIAN_SWAP_INT32(x)				({uint32_t tt; __stwbrx(&tt, x); tt;})
 #define NO_64BIT_BYTESWAP
+// NetBSD
+#elif defined(__NetBSD__)
+#include <machine/endian.h>
+#define BURN_ENDIAN_SWAP_INT8(x)				(x^1)
+#define BURN_ENDIAN_SWAP_INT16(x)				(bswap16(x))
+#define BURN_ENDIAN_SWAP_INT32(x)				(bswap32(x))
+#define BURN_ENDIAN_SWAP_INT64(x)				(bswap64(x))
 // GC/Wii/WiiU
 //#elif defined(HW_RVL)
 //#define BURN_ENDIAN_SWAP_INT8(x)				(x^1)
File Deleted: pkgsrc/emulators/libretro-fbneo/patches/Attic/patch-src_burner_libretro_burn__endian.h
cvs diff -r1.2 -r1.3 pkgsrc/emulators/libretro-fbneo/patches/patch-src_burner_libretro_retro__common.h (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-fbneo/patches/patch-src_burner_libretro_retro__common.h 2020/09/10 10:10:18 1.2
+++ pkgsrc/emulators/libretro-fbneo/patches/patch-src_burner_libretro_retro__common.h 2023/05/29 14:33:14 1.3
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: patch-src_burner_libretro_retro__common.h,v 1.2 2020/09/10 10:10:18 nia Exp $ 1$NetBSD: patch-src_burner_libretro_retro__common.h,v 1.3 2023/05/29 14:33:14 nia Exp $
2 2
3Don't cast lvalues. 3Don't cast lvalues.
4 4
5--- src/burner/libretro/retro_common.h.orig 2020-05-30 15:55:11.000000000 +0000 5--- src/burner/libretro/retro_common.h.orig 2023-05-24 08:09:39.000000000 +0000
6+++ src/burner/libretro/retro_common.h 6+++ src/burner/libretro/retro_common.h
7@@ -7,7 +7,11 @@ 7@@ -7,7 +7,11 @@
8 #include <vector> 8 #include <vector>
9 #include "burner.h" 9 #include "burner.h"
10  10
 11-#define SSTR( x ) static_cast< const std::ostringstream & >(( std::ostringstream() << std::dec << x ) ).str()
11+#ifndef __clang__ 12+#ifndef __clang__
12 #define SSTR( x ) static_cast< std::ostringstream & >(( std::ostringstream() << std::dec << x ) ).str() 13+#define SSTR( x ) static_cast< std::ostringstream & >(( std::ostringstream() << std::dec << x ) ).str()
13+#else 14+#else
14+#define SSTR( x ) ((( std::ostringstream() << std::dec << x ) ).str()) 15+#define SSTR( x ) ((( std::ostringstream() << std::dec << x ) ).str())
15+#endif 16+#endif
16  17
17 #define RETRO_GAME_TYPE_CV 1 18 #define RETRO_GAME_TYPE_CV 1
18 #define RETRO_GAME_TYPE_GG 2 19 #define RETRO_GAME_TYPE_GG 2