libretro-beetle-saturn: Update to 20200526

David Walters (33):
      Update RETRO_ENVIRONMENT_SET_CONTROLLER_INFO when 6player adaptors are added/removed.
      Version bump
      state.h macro changes + fallout from that
      SCSP (audio cpu) sync.
      MDFN_HOT macro stub, to reduce number of diffs
      Reduce number of diff lines via closer sync of non-essential whitespace, formatting, macro attributes, etc.
      m68k register set/get
      VDP1 + VDP2 sync.
      Cartridge sync
      input sync (no JP keyboard)
      SCU sync.
      minor missing sync + fixes
      more syncing
      git + input "IDIIS" + jpkeyboard sync.
      gettext_noop sync
      SCU update sync + version bump
      Fix gun crosshair X position
      Fix for DOT crosshair mode
      Fix for Linux builds. Mednafen defines SIZEOF_VOID_P in its configure script, we do something similar with a makefile.
      Fix for new 3d pad internal data format
      version bump
      Game specific hacks
      merging of misc bits
      version bump
      new document
      Game specific hack (Fighting Vipers)
      SH-2 bugfix
      Reorganized SCSP DSP emulation
      Emulated input devices' internal states were not being reset on virtual power toggle
      version bump
      merging
      Sync with v1.22.2 of Mednafen
      fix crash bug when two multitaps are connected

Yoshi Sugawara (8):
      first hack to get touchscreen lightgun input working
      add core option for lightgun input: lightgun or touchscreen; check input mode when handling input
      remove debug statements
      added back setting gun position and button state for lightgun input
      touchscreen sensitivity: manually hold the gun position for a few cycles after the touch is released to ensure the fire happens at the right position
      Setting CC and CCX for ios-arm64 platform for buildbot recipe
      fixed arch argument to arm64
      (tvOS) support building

jdgleaver (1):
      Add disk control interface v1 support

3 files changed, 90 insertions, 31 deletions

diff --git a/emulators/libretro-beetle-saturn/Makefile b/emulators/libretro-beetle-saturn/Makefile
index ff7d881fe3f..94466ceaea5 100644
--- a/emulators/libretro-beetle-saturn/Makefile
+++ b/emulators/libretro-beetle-saturn/Makefile
@@ -1,45 +1,35 @@
-# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:12 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/31 18:15:11 nia Exp $
 
-DISTNAME=	libretro-beetle-saturn-20180620
-PKGREVISION=	1
+DISTNAME=	libretro-beetle-saturn-20200526
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
 GITHUB_PROJECT=	beetle-saturn-libretro
-GITHUB_TAG=	1983713f665e86459900a08873fac09e70c31bfa
+GITHUB_TAG=	7ba4ff3aed62a60e99e0758a92dbb1924c63d0fa
 
-MAINTAINER=	nia@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://docs.libretro.com/library/beetle_saturn/
 COMMENT=	Libretro core based on the Mednafen Sega Saturn emulator
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
-OPSYSVARS+=	SOEXT
-SOEXT.Darwin=	dylib
-SOEXT.*=	so
-PLIST_SUBST+=	SOEXT=${SOEXT}
+LIBRETRO_CORE=	mednafen_saturn
 
-MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
+LDFLAGS+=	-lFLAC -lz
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux"
+MAKE_FLAGS+=	HAVE_CDROM=0
+.endif
 
 # "experimental, x86_64 only" - https://mednafen.github.io/
 # Not built by upstream's buildbot for i386, ARM, or PowerPC.
 ONLY_FOR_PLATFORM=	*-*-x86_64
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=link.T
-BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--no-undefined
-
-INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
-
-.include "../../mk/endian.mk"
-
-.if ${MACHINE_ENDIAN} == "big"
-CFLAGS+=	-DMSB_FIRST
-.endif
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/mednafen_saturn_libretro.so \
-	    ${DESTDIR}${PREFIX}/lib/libretro/mednafen_saturn_libretro.so
 
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../emulators/retroarch/core.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/libretro-beetle-saturn/distinfo b/emulators/libretro-beetle-saturn/distinfo
index 80dccd1b408..a47ff0d203c 100644
--- a/emulators/libretro-beetle-saturn/distinfo
+++ b/emulators/libretro-beetle-saturn/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2019/12/22 22:24:22 joerg Exp $
+$NetBSD: distinfo,v 1.4 2020/05/31 18:15:11 nia Exp $
 
-SHA1 (libretro-beetle-saturn-20180620-1983713f665e86459900a08873fac09e70c31bfa.tar.gz) = 443c3a9567b4bfb47eccfcf01cf3db80bfb07f75
-RMD160 (libretro-beetle-saturn-20180620-1983713f665e86459900a08873fac09e70c31bfa.tar.gz) = 89574f1ac0987ec18ad2cd6d76fa0d728583a431
-SHA512 (libretro-beetle-saturn-20180620-1983713f665e86459900a08873fac09e70c31bfa.tar.gz) = 7ca419b0ac495284796d3acc0b52a66b7f821733c77c2c9f23c478bf356ad52cff3c1b8236de7de04118dd7c96a332eeba17f207887d995b8aff10c58a4d5992
-Size (libretro-beetle-saturn-20180620-1983713f665e86459900a08873fac09e70c31bfa.tar.gz) = 1420451 bytes
+SHA1 (libretro-beetle-saturn-20200526-7ba4ff3aed62a60e99e0758a92dbb1924c63d0fa.tar.gz) = 1a6d4dc61a863b5cf93febd02b84dba7f4bdc86d
+RMD160 (libretro-beetle-saturn-20200526-7ba4ff3aed62a60e99e0758a92dbb1924c63d0fa.tar.gz) = b44122f1514be3591b1be7c2300a2f6320a15fc5
+SHA512 (libretro-beetle-saturn-20200526-7ba4ff3aed62a60e99e0758a92dbb1924c63d0fa.tar.gz) = 231d2ac5a7daebdd84e3bc9cd4b877b2e3719320d878477c5b8f609a9bc2a142b72cf648349191ba3336eb5d7896989482fde6405b587e3e41c595b0ab22a600
+Size (libretro-beetle-saturn-20200526-7ba4ff3aed62a60e99e0758a92dbb1924c63d0fa.tar.gz) = 1473604 bytes
+SHA1 (patch-Makefile.common) = 1dc9e7ef92d8ce735e378dd824bb14bae0b9bfd4
 SHA1 (patch-libretro-common_rthreads_rthreads.c) = d774aa27221362400cdd0dc842fedc07519945ca
 SHA1 (patch-mednafen_ss_vdp1__common.h) = af0a979397ef0be454d7b522d987a982bfffb320
diff --git a/emulators/libretro-beetle-saturn/patches/patch-Makefile.common b/emulators/libretro-beetle-saturn/patches/patch-Makefile.common
new file mode 100644
index 00000000000..633b0a4f42e
--- /dev/null
+++ b/emulators/libretro-beetle-saturn/patches/patch-Makefile.common
@@ -0,0 +1,68 @@
+$NetBSD: patch-Makefile.common,v 1.1 2020/05/31 18:15:12 nia Exp $
+
+Avoid using bundled deps.
+
+--- Makefile.common.orig	2020-05-26 19:46:07.000000000 +0000
++++ Makefile.common
+@@ -7,24 +7,9 @@ MEDNAFEN_DIR := $(CORE_DIR)/mednafen
+ CORE_EMU_DIR := $(MEDNAFEN_DIR)/ss
+ CDROM_DIR    := $(MEDNAFEN_DIR)/cdrom
+ 
+-INCFLAGS := -I$(CORE_DIR) -I$(MEDNAFEN_DIR) -I$(MEDNAFEN_DIR)/include -I$(MEDNAFEN_DIR)/intl -I$(MEDNAFEN_DIR)/hw_sound -I$(MEDNAFEN_DIR)/hw_cpu -I$(MEDNAFEN_DIR)/hw_misc -I$(LIBRETRO_DIR)/include -I$(DEPS_DIR)/zlib
++INCFLAGS := -I$(CORE_DIR) -I$(MEDNAFEN_DIR) -I$(MEDNAFEN_DIR)/include -I$(MEDNAFEN_DIR)/intl -I$(MEDNAFEN_DIR)/hw_sound -I$(MEDNAFEN_DIR)/hw_cpu -I$(MEDNAFEN_DIR)/hw_misc -I$(LIBRETRO_DIR)/include
+ 
+ 
+-SOURCES_C += $(DEPS_DIR)/zlib/adler32.c \
+-				 $(DEPS_DIR)/zlib/compress.c \
+-				 $(DEPS_DIR)/zlib/crc32.c \
+-				 $(DEPS_DIR)/zlib/deflate.c \
+-				 $(DEPS_DIR)/zlib/gzclose.c \
+-				 $(DEPS_DIR)/zlib/gzlib.c \
+-				 $(DEPS_DIR)/zlib/gzread.c \
+-				 $(DEPS_DIR)/zlib/gzwrite.c \
+-				 $(DEPS_DIR)/zlib/inffast.c \
+-				 $(DEPS_DIR)/zlib/inflate.c \
+-				 $(DEPS_DIR)/zlib/inftrees.c \
+-				 $(DEPS_DIR)/zlib/trees.c \
+-				 $(DEPS_DIR)/zlib/uncompr.c \
+-				 $(DEPS_DIR)/zlib/zutil.c
+-
+ ifeq ($(HAVE_GRIFFIN),1)
+ SOURCES_CXX += beetle_ss_griffin.cpp
+ 
+@@ -95,7 +80,7 @@ endif
+ 
+ ifeq ($(HAVE_CHD), 1)
+    FLAGS += -DHAVE_CHD -D_7ZIP_ST -DPACKAGE_VERSION=\"1.3.2\" -DFLAC_API_EXPORTS -DFLAC__HAS_OGG=0 -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DHAVE_SYS_PARAM_H
+-   INCFLAGS += -I$(DEPS_DIR)/crypto -I$(DEPS_DIR)/flac-1.3.2/include -I$(DEPS_DIR)/flac-1.3.2/src/libFLAC/include -I$(DEPS_DIR)/lzma-16.04/C -I$(DEPS_DIR)/libchdr
++   INCFLAGS += -I$(DEPS_DIR)/crypto -I$(DEPS_DIR)/lzma-16.04/C -I$(DEPS_DIR)/libchdr
+ 
+    ifeq ($(platform), win)
+        FLAGS += -DHAVE_FSEEKO
+@@ -169,26 +154,6 @@ ifeq ($(HAVE_CHD), 1)
+ SOURCES_C += \
+ 	$(DEPS_DIR)/crypto/md5.c \
+ 	$(DEPS_DIR)/crypto/sha1.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitmath.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitreader.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/cpu.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/crc.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/float.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/format.c \
+- 	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/md5.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/memory.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_iterators.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_object.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/stream_decoder.c \
+-	$(DEPS_DIR)/flac-1.3.2/src/libFLAC/window.c \
+ 	$(DEPS_DIR)/lzma-16.04/C/Alloc.c \
+ 	$(DEPS_DIR)/lzma-16.04/C/Bra86.c \
+ 	$(DEPS_DIR)/lzma-16.04/C/Bra.c \