libretro-cap32: Update to 20200508

Vladimir Serbinenko (11):
      Remove unused GetTicks
      Fix psl1ght support
      QNX fixes
      Apply c++ flags also on debug version
      Fix crash on blackberry
      Fix declaration of ev_events
      Fix Core_PollEvent declaration
      Replace ad-hoc MSB_FIRST with retro_endianness.h
      Fix video glitch on big-endian
      Fix incorrect dereferencing
      Cleanup wiiu flags

3 files changed, 46 insertions, 26 deletions

diff --git a/emulators/libretro-cap32/Makefile b/emulators/libretro-cap32/Makefile
index 72bf8577514..05901ebb7d1 100644
--- a/emulators/libretro-cap32/Makefile
+++ b/emulators/libretro-cap32/Makefile
@@ -1,37 +1,22 @@
-# $NetBSD: Makefile,v 1.4 2020/05/26 09:45:13 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/30 16:19:44 nia Exp $
 
-DISTNAME=	libretro-cap32-20190128
+DISTNAME=	libretro-cap32-20200508
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
-GITHUB_TAG=	1a8bcf4d68b633bb8e92e20da460ac7618e8b950
+GITHUB_TAG=	2fe00cafcfcd8dd4f0fcdcbd1f5e2cc1c0669e43
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://docs.libretro.com/library/caprice32/
 COMMENT=	Libretro core based on the Caprice32 Amstrad CPC emulator
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c99
+LIBRETRO_CORE=	cap32
 
-OPSYSVARS+=	SOEXT
-SOEXT.Darwin=	dylib
-SOEXT.*=	so
-PLIST_SUBST+=	SOEXT=${SOEXT}
-
-.include "../../mk/endian.mk"
-
-.if ${MACHINE_ENDIAN} == "big"
-CFLAGS+=	-DMSB_FIRST
-.endif
+LDFLAGS+=	-lz
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-version-script=link.T
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-no-undefined
 
-INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/cap32_libretro.so \
-	    ${DESTDIR}${PREFIX}/lib/libretro/cap32_libretro.so
-
+.include "../../emulators/retroarch/core.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/libretro-cap32/distinfo b/emulators/libretro-cap32/distinfo
index 69093b523c2..305e3d3971d 100644
--- a/emulators/libretro-cap32/distinfo
+++ b/emulators/libretro-cap32/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/02/01 10:11:03 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/05/30 16:19:44 nia Exp $
 
-SHA1 (libretro-cap32-20190128-1a8bcf4d68b633bb8e92e20da460ac7618e8b950.tar.gz) = 3b2952118ee3c422c323f4f4fce62dfe0cec8006
-RMD160 (libretro-cap32-20190128-1a8bcf4d68b633bb8e92e20da460ac7618e8b950.tar.gz) = 958194309a9da3c015d0b83d531593e49a932afa
-SHA512 (libretro-cap32-20190128-1a8bcf4d68b633bb8e92e20da460ac7618e8b950.tar.gz) = 431d05af092379deca5715200a153c1955a2213aad3457c5f3be04bdf898ef0204fdc304e9c26613c5de30f4bd7da6a8b0821da15f6ed9ca80f4abf87dd1c648
-Size (libretro-cap32-20190128-1a8bcf4d68b633bb8e92e20da460ac7618e8b950.tar.gz) = 803018 bytes
+SHA1 (libretro-cap32-20200508-2fe00cafcfcd8dd4f0fcdcbd1f5e2cc1c0669e43.tar.gz) = 3d7485dcc43a95ee06f8ea57e55cf165a8c5185e
+RMD160 (libretro-cap32-20200508-2fe00cafcfcd8dd4f0fcdcbd1f5e2cc1c0669e43.tar.gz) = 20c8957035d7c18c908d721088085c854390f698
+SHA512 (libretro-cap32-20200508-2fe00cafcfcd8dd4f0fcdcbd1f5e2cc1c0669e43.tar.gz) = 75ba2ecc726a445c18008915ff38b62179d565254888b0f65c40c265ec2b6e77745adc070c71a4796970e15a8b20720452dc1a7e321932198b810f282a5267a7
+Size (libretro-cap32-20200508-2fe00cafcfcd8dd4f0fcdcbd1f5e2cc1c0669e43.tar.gz) = 1048314 bytes
+SHA1 (patch-Makefile.common) = be5af7bd5ae9dfb70f982a37f8c0531471bf611f
diff --git a/emulators/libretro-cap32/patches/patch-Makefile.common b/emulators/libretro-cap32/patches/patch-Makefile.common
new file mode 100644
index 00000000000..d052d471373
--- /dev/null
+++ b/emulators/libretro-cap32/patches/patch-Makefile.common
@@ -0,0 +1,34 @@
+$NetBSD: patch-Makefile.common,v 1.1 2020/05/30 16:19:44 nia Exp $
+
+Don't vendor zlib.
+
+--- Makefile.common.orig	2020-05-08 13:51:31.000000000 +0000
++++ Makefile.common
+@@ -8,8 +8,7 @@ INCFLAGS := \
+ 	-I$(CORE_DIR)/libretro  \
+ 	-I$(GUI) \
+ 	-I$(GUI)/nuklear \
+-	-I$(GUI)/retro \
+-   -I$(DEPS)/zlib
++	-I$(GUI)/retro
+ 
+ SOURCES_C := \
+ 				 $(CORE_DIR)/libretro/libretro-core.c \
+@@ -33,17 +32,3 @@ SOURCES_C += $(CORE_DIR)/libretro/retro_
+ SOURCES_C += $(CORE_DIR)/libretro/retro_disk_control.c
+ SOURCES_C += $(CORE_DIR)/libretro/retro_events.c
+ SOURCES_C += $(CORE_DIR)/libretro/retro_snd.c
+-
+-SOURCES_C += \
+-      $(DEPS)/zlib/adler32.c \
+-      $(DEPS)/zlib/inflate.c \
+-      $(DEPS)/zlib/inffast.c \
+-      $(DEPS)/zlib/inftrees.c \
+-      $(DEPS)/zlib/zutil.c \
+-      $(DEPS)/zlib/gzread.c \
+-      $(DEPS)/zlib/gzwrite.c \
+-      $(DEPS)/zlib/gzclose.c \
+-      $(DEPS)/zlib/gzlib.c \
+-      $(DEPS)/zlib/trees.c \
+-      $(DEPS)/zlib/crc32.c \
+-      $(DEPS)/zlib/deflate.c