libretro-mame2010: Update to 20200525

Aaron Kling (3):
      Don't compare pointers to zero
      Move objects lists into variables
      libretro: jni: Fix jni makefiles

Mark W. Kidd (2):
      use core name for DAT
      use core-generated DAT

hizzlekizzle (3):
      add ARM 64-bit build target for android
      backport 12-bit wrapping fix

pjft (1):
      Fix for ARM memory accesses (#139)

4 files changed, 18 insertions, 56 deletions

diff --git a/emulators/libretro-mame2010/Makefile b/emulators/libretro-mame2010/Makefile
index 385b54cb635..0cd9521d122 100644
--- a/emulators/libretro-mame2010/Makefile
+++ b/emulators/libretro-mame2010/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2020/05/26 09:45:15 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/30 20:36:15 nia Exp $
 
-DISTNAME=	libretro-mame2010-20180417
+DISTNAME=	libretro-mame2010-20200525
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
 GITHUB_PROJECT=	mame2010-libretro
-GITHUB_TAG=	70732f9137f6bb2bde4014746ea8bc613173dd1e
+GITHUB_TAG=	bef96188e7276422eab81b44b41361896885bae5
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://docs.libretro.com/library/mame_2010/
@@ -31,7 +31,7 @@ CFLAGS+=	-DMSB_FIRST
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Bitrig"
+.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
 CFLAGS+=	-DSDLMAME_BSD
 .endif
 
@@ -39,6 +39,8 @@ CFLAGS+=	-DSDLMAME_BSD
 CFLAGS+=	-DNO_AFFINITY_NP
 .endif
 
+CFLAGS+=	-Wno-narrowing
+
 .if ${MACHINE_ARCH} != "x86_64" && ${MACHINE_ARCH} != "i386"
 MAKE_FLAGS+=	FORCE_DRC_C_BACKEND=1
 .endif
diff --git a/emulators/libretro-mame2010/distinfo b/emulators/libretro-mame2010/distinfo
index e5bdfd27063..fa5e075d397 100644
--- a/emulators/libretro-mame2010/distinfo
+++ b/emulators/libretro-mame2010/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.2 2020/05/14 19:35:59 joerg Exp $
+$NetBSD: distinfo,v 1.3 2020/05/30 20:36:15 nia Exp $
 
-SHA1 (libretro-mame2010-20180417-70732f9137f6bb2bde4014746ea8bc613173dd1e.tar.gz) = c755106da94893012afb9d31bf488e0bd71f983d
-RMD160 (libretro-mame2010-20180417-70732f9137f6bb2bde4014746ea8bc613173dd1e.tar.gz) = a39a85b9d96ca17edb25b941963f8217069bc22e
-SHA512 (libretro-mame2010-20180417-70732f9137f6bb2bde4014746ea8bc613173dd1e.tar.gz) = 6b8bc3111eebe19387f6927ee24ba4edef6505c7540c87b872d2930c4b786010ebc63f97b14be427c00182838cffb5e8d707ab38d295ac1144eb4787ada4cfd0
-Size (libretro-mame2010-20180417-70732f9137f6bb2bde4014746ea8bc613173dd1e.tar.gz) = 23952671 bytes
+SHA1 (libretro-mame2010-20200525-bef96188e7276422eab81b44b41361896885bae5.tar.gz) = 1a9b99431b50f576236b33a82b1a4a0c17754402
+RMD160 (libretro-mame2010-20200525-bef96188e7276422eab81b44b41361896885bae5.tar.gz) = 52ab590b9401ae039cfae5beb34fc514144be9a1
+SHA512 (libretro-mame2010-20200525-bef96188e7276422eab81b44b41361896885bae5.tar.gz) = 2da2fdf04c5198b24cf74402a13bdc77a61bd3dbcc5e682485884611ffffdc4824ac32709b3a6e24b5df1263392f4fa1939020c22202bbfea6f7ce907293b64e
+Size (libretro-mame2010-20200525-bef96188e7276422eab81b44b41361896885bae5.tar.gz) = 24302224 bytes
 SHA1 (patch-Makefile) = ac0a4ba498396911e195278e84cffdc5f98996a2
 SHA1 (patch-src_emu_emucore.h) = ecb9617e260559aeb685e9625195f2ad6c99244d
-SHA1 (patch-src_emu_hiscore.c) = 2c2b10e863c57301d70ae7b2bb00f393e170dbbd
 SHA1 (patch-src_emu_romload.c) = 7907e934439a7e5ed92c71394e6a9a0c5ef9cf94
-SHA1 (patch-src_emu_state.h) = 3c6d8555a8bf20904962c14f629fd5ff360684b4
+SHA1 (patch-src_emu_state.h) = 60109326f67e079d1cd073bc15393d3b3dbb2ce9
 SHA1 (patch-src_emu_uimenu.c) = 717302298958fd0734899537ca8b77f45aa8dd77
diff --git a/emulators/libretro-mame2010/patches/patch-src_emu_hiscore.c b/emulators/libretro-mame2010/patches/patch-src_emu_hiscore.c
deleted file mode 100644
index 761ce8425a2..00000000000
--- a/emulators/libretro-mame2010/patches/patch-src_emu_hiscore.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_emu_hiscore.c,v 1.1 2020/05/14 19:35:59 joerg Exp $
-
---- src/emu/hiscore.c.orig	2020-05-13 15:19:06.758626807 +0000
-+++ src/emu/hiscore.c
-@@ -48,7 +48,7 @@ static void copy_to_memory (running_mach
- {
- 	int i;
- 	const address_space *targetspace;
--	if (strstr(machine->gamedrv->source_file,"cinemat.c") > 0)
-+	if (strstr(machine->gamedrv->source_file,"cinemat.c"))
- 	{
- 		 targetspace = cpu_get_address_space(machine->cpu[cpu], ADDRESS_SPACE_DATA);
- 	}
-@@ -67,7 +67,7 @@ static void copy_from_memory (running_ma
- {
- 	int i;
- 	const address_space *targetspace;
--	if (strstr(machine->gamedrv->source_file,"cinemat.c") > 0)
-+	if (strstr(machine->gamedrv->source_file,"cinemat.c"))
- 	{
- 		 targetspace = cpu_get_address_space(machine->cpu[cpu], ADDRESS_SPACE_DATA);
- 	}
-@@ -166,7 +166,7 @@ static int safe_to_load (running_machine
- {
- 	memory_range *mem_range = state.mem_range;
- 	const address_space *srcspace;
--	if (strstr(machine->gamedrv->source_file,"cinemat.c") > 0)
-+	if (strstr(machine->gamedrv->source_file,"cinemat.c"))
- 	{
- 		srcspace = cpu_get_address_space(machine->cpu[mem_range->cpu], ADDRESS_SPACE_DATA);
- 	}
-@@ -316,7 +316,7 @@ void hiscore_init (running_machine *mach
- 	while (mem_range)
- 	{
- 
--		if (strstr(machine->gamedrv->source_file,"cinemat.c") > 0)
-+		if (strstr(machine->gamedrv->source_file,"cinemat.c"))
- 		{
- 			memory_write_byte(
- 				cpu_get_address_space(machine->cpu[mem_range->cpu], ADDRESS_SPACE_DATA),
diff --git a/emulators/libretro-mame2010/patches/patch-src_emu_state.h b/emulators/libretro-mame2010/patches/patch-src_emu_state.h
index 00a6f898ba2..2cee1502afd 100644
--- a/emulators/libretro-mame2010/patches/patch-src_emu_state.h
+++ b/emulators/libretro-mame2010/patches/patch-src_emu_state.h
@@ -1,17 +1,18 @@
-$NetBSD: patch-src_emu_state.h,v 1.1 2020/05/14 19:35:59 joerg Exp $
+$NetBSD: patch-src_emu_state.h,v 1.2 2020/05/30 20:36:15 nia Exp $
 
---- src/emu/state.h.orig	2020-05-13 15:02:59.769613659 +0000
+--- src/emu/state.h.orig	2020-05-25 02:01:22.000000000 +0000
 +++ src/emu/state.h
-@@ -18,16 +18,8 @@
+@@ -18,17 +18,8 @@
  #ifndef __STATE_H__

  #define __STATE_H__

  

--#if defined(__MACH__) && !defined(IOS)

+-#if (defined(__MACH__) && !defined(IOS)) || defined(ANDROID)

  #include <type_traits>

  #define DEF_NAMESPACE std

 -#elif defined(IOS)

--#include <tr1/type_traits>

+-#include <type_traits>

 -#define DEF_NAMESPACE std::tr1

+-#define DEF_NAMESPACE std

 -#elif defined(__GNUC__)

 -#include <tr1/type_traits>

 -#define DEF_NAMESPACE std::tr1