Thu Sep 10 10:10:18 2020 UTC ()
libretro-fbneo: Unbreak gcc7 build.

Tried to fix this properly then got confused by C++ nonsense.


(nia)
diff -r1.3 -r1.4 pkgsrc/emulators/libretro-fbneo/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/libretro-fbneo/patches/patch-src_burner_libretro_retro__common.h

cvs diff -r1.3 -r1.4 pkgsrc/emulators/libretro-fbneo/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-fbneo/distinfo 2020/08/11 18:47:14 1.3
+++ pkgsrc/emulators/libretro-fbneo/distinfo 2020/09/10 10:10:17 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.3 2020/08/11 18:47:14 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2020/09/10 10:10:17 nia Exp $
2 2
3SHA1 (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = c7b22edc2ae2ac2fff494dd80acfec6e49b9133c 3SHA1 (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = c7b22edc2ae2ac2fff494dd80acfec6e49b9133c
4RMD160 (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = b4d9a8c285aec224e7da70a004e64825548936bf 4RMD160 (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = b4d9a8c285aec224e7da70a004e64825548936bf
5SHA512 (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = 0ef4a27bd9fa0d49f5ea09777f2144a9b0be9c9fced59593ba15e9f4818a305d2ca85a2ef3850cef77032157265376f5f3204b6c81226001c94d85f346829843 5SHA512 (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = 0ef4a27bd9fa0d49f5ea09777f2144a9b0be9c9fced59593ba15e9f4818a305d2ca85a2ef3850cef77032157265376f5f3204b6c81226001c94d85f346829843
6Size (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = 14602038 bytes 6Size (libretro-fbneo-20200530-301cf7b6eeb3e7683952b98b66f39008f580b26d.tar.gz) = 14602038 bytes
7SHA1 (patch-src_burner_libretro_burn__endian.h) = 35b3ea13154bd5380ad5d067f3ec5f32ab18ce36 7SHA1 (patch-src_burner_libretro_burn__endian.h) = 35b3ea13154bd5380ad5d067f3ec5f32ab18ce36
8SHA1 (patch-src_burner_libretro_retro__common.h) = ef3307f225396e8099db06483de07a4f0d3358cc 8SHA1 (patch-src_burner_libretro_retro__common.h) = 5bb4c3ff577841e1c89e689a272ad4a188cba5d4

cvs diff -r1.1 -r1.2 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/08/11 18:47:14 1.1
+++ pkgsrc/emulators/libretro-fbneo/patches/patch-src_burner_libretro_retro__common.h 2020/09/10 10:10:18 1.2
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: patch-src_burner_libretro_retro__common.h,v 1.1 2020/08/11 18:47:14 joerg Exp $ 1$NetBSD: patch-src_burner_libretro_retro__common.h,v 1.2 2020/09/10 10:10:18 nia Exp $
2 2
3Don't cast lvalues. 3Don't cast lvalues.
4 4
5--- src/burner/libretro/retro_common.h.orig 2020-08-10 22:37:10.415674566 +0000 5--- src/burner/libretro/retro_common.h.orig 2020-05-30 15:55:11.000000000 +0000
6+++ src/burner/libretro/retro_common.h 6+++ src/burner/libretro/retro_common.h
7@@ -7,7 +7,7 @@ 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< std::ostringstream & >(( std::ostringstream() << std::dec << x ) ).str() 11+#ifndef __clang__
 12 #define SSTR( x ) static_cast< std::ostringstream & >(( std::ostringstream() << std::dec << x ) ).str()
 13+#else
12+#define SSTR( x ) ((( std::ostringstream() << std::dec << x ) ).str()) 14+#define SSTR( x ) ((( std::ostringstream() << std::dec << x ) ).str())
 15+#endif
13  16
14 #define RETRO_GAME_TYPE_CV 1 17 #define RETRO_GAME_TYPE_CV 1
15 #define RETRO_GAME_TYPE_GG 2 18 #define RETRO_GAME_TYPE_GG 2