libretro-beetle-psx: Update to 20200610

pkgsrc changes:
- Unbundle dependencies.

Upstream changes:
- illumos build unbroken.
- pkgsrc patch upstreamed.

4 files changed, 97 insertions, 28 deletions

diff --git a/emulators/libretro-beetle-psx/Makefile.common b/emulators/libretro-beetle-psx/Makefile.common
index 573850767ad..32c81a08db3 100644
--- a/emulators/libretro-beetle-psx/Makefile.common
+++ b/emulators/libretro-beetle-psx/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.4 2020/05/30 14:59:10 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2020/06/13 11:56:23 nia Exp $
 
 # used by emulators/libretro-beetle-psx-hw/Makefile
 # used by emulators/libretro-beetle-psx/Makefile
 
-VERSION=	20200526
+VERSION=	20200610
 DISTNAME=	libretro-beetle-psx-${VERSION}
 CATEGORIES=	emulators
 GITHUB_PROJECT=	beetle-psx-libretro
-GITHUB_TAG=	12014e1f317ae8bda1c9ccce319d9dd78f253d2f
+GITHUB_TAG=	3db06fd98c4ad2e4c35f31dd1bbc71c519a26f7a
 
 LICENSE=	gnu-gpl-v2
 
@@ -16,6 +16,13 @@ PATCHDIR=	${.CURDIR}/../../emulators/libretro-beetle-psx/patches
 MESSAGE_SRC=	${.CURDIR}/../../emulators/libretro-beetle-psx/MESSAGE
 
 USE_LANGUAGES=	c c++03
+USE_TOOLS+=	pkg-config
+
+MAKE_FLAGS+=	SYSTEM_ZLIB=1
+
+LDFLAGS+=	-lFLAC
 
 .include "../../emulators/retroarch/core.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/emulators/libretro-beetle-psx/distinfo b/emulators/libretro-beetle-psx/distinfo
index 3d8e353c82c..e80a283c624 100644
--- a/emulators/libretro-beetle-psx/distinfo
+++ b/emulators/libretro-beetle-psx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2020/05/30 14:59:10 nia Exp $
+$NetBSD: distinfo,v 1.5 2020/06/13 11:56:23 nia Exp $
 
-SHA1 (libretro-beetle-psx-20200526-12014e1f317ae8bda1c9ccce319d9dd78f253d2f.tar.gz) = 008c5f1bf30aadf21de12b9788399ff186c8a507
-RMD160 (libretro-beetle-psx-20200526-12014e1f317ae8bda1c9ccce319d9dd78f253d2f.tar.gz) = 1ae8c4b809260ddc0b9a035213ba38635360eb5e
-SHA512 (libretro-beetle-psx-20200526-12014e1f317ae8bda1c9ccce319d9dd78f253d2f.tar.gz) = 8778739f4b02af76b0774d99889888aa0f96c4ee106a29f5870ed9e464fb2ee4017e925ca6d9578975149e30d37555a38528c4d6ece0a862b42585be68a2e7cc
-Size (libretro-beetle-psx-20200526-12014e1f317ae8bda1c9ccce319d9dd78f253d2f.tar.gz) = 2907552 bytes
+SHA1 (libretro-beetle-psx-20200610-3db06fd98c4ad2e4c35f31dd1bbc71c519a26f7a.tar.gz) = 81d8183b21f80314515889556e2dcc759d253703
+RMD160 (libretro-beetle-psx-20200610-3db06fd98c4ad2e4c35f31dd1bbc71c519a26f7a.tar.gz) = 0b5e70b9455588c743e00fccf22ee0d654c7f4ac
+SHA512 (libretro-beetle-psx-20200610-3db06fd98c4ad2e4c35f31dd1bbc71c519a26f7a.tar.gz) = d99c389595985b27815429dfd65d11d6899949f7981b5f7bd6c1dd008365a51c297e4d3504d8c07451914b08d4b3d96d9f0c24fe49b9a8a6b38722ab072c9f51
+Size (libretro-beetle-psx-20200610-3db06fd98c4ad2e4c35f31dd1bbc71c519a26f7a.tar.gz) = 2907608 bytes
+SHA1 (patch-Makefile.common) = f4f72feae1602c6806b974b4816142d3494f1ddf
 SHA1 (patch-libretro-common_rthreads_rthreads.c) = 1ba4a13ca0ae3e7fe0b4cb7259d3ee7d6629781b
-SHA1 (patch-libretro.cpp) = cc3de00e69f457d9f6fd7324285113aeb5bba972
diff --git a/emulators/libretro-beetle-psx/patches/patch-Makefile.common b/emulators/libretro-beetle-psx/patches/patch-Makefile.common
new file mode 100644
index 00000000000..a96ae2e643c
--- /dev/null
+++ b/emulators/libretro-beetle-psx/patches/patch-Makefile.common
@@ -0,0 +1,81 @@
+$NetBSD: patch-Makefile.common,v 1.1 2020/06/13 11:56:23 nia Exp $
+
+Avoid using bundled libflac and zlib.
+
+--- Makefile.common.orig	2020-06-10 14:08:45.000000000 +0000
++++ Makefile.common
+@@ -10,32 +10,10 @@ RSXGL_DIR    := $(CORE_DIR)/rustation-li
+ CDROM_DIR    := $(MEDNAFEN_DIR)/cdrom
+ 
+ LIBCHDR_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
+ LIBCHDR_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 \
+@@ -55,22 +33,6 @@ LIBCHDR_SOURCES_C = $(DEPS_DIR)/crypto/m
+                      $(DEPS_DIR)/libchdr/flac.c \
+                      $(DEPS_DIR)/libchdr/huffman.c
+ 
+-ZLIB_INCFLAGS = -I$(DEPS_DIR)/zlib
+-ZLIB_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_OPENGL), 1)
+    ifeq ($(GLES), 1)
+       GLFLAGS  := -DHAVE_OPENGLES -DHAVE_OPENGLES2
+@@ -195,8 +157,6 @@ ifeq ($(HAVE_CHD), 1)
+       LIBS += $(shell pkg-config --libs libchdr)
+    else
+       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
+    endif
+@@ -379,9 +339,6 @@ SOURCES_C +=   $(CORE_DIR)/pgxp/pgxp_cpu
+ ifeq ($(HAVE_CHD), 1)
+    ifneq ($(SYSTEM_LIBCHDR), 1)
+       SOURCES_C += $(LIBCHDR_SOURCES_C)
+-      ifneq (,$(findstring win,$(platform)))
+-         SOURCES_C += $(DEPS_DIR)/flac-1.3.2/src/libFLAC/windows_unicode_filenames.c
+-      endif
+    endif
+ 
+    SOURCES_CXX += $(CDROM_DIR)/CDAccess_CHD.cpp
diff --git a/emulators/libretro-beetle-psx/patches/patch-libretro.cpp b/emulators/libretro-beetle-psx/patches/patch-libretro.cpp
deleted file mode 100644
index 0fbc863adfe..00000000000
--- a/emulators/libretro-beetle-psx/patches/patch-libretro.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-libretro.cpp,v 1.1 2020/05/30 15:01:19 nia Exp $
-
-libretro.cpp: In function 'int lightrec_init_mmap()':
-libretro.cpp:1683:4: error: 'S_IRUSR' was not declared in this scope
-    S_IRUSR | S_IWUSR);
-    ^~~~~~~
-libretro.cpp:1683:14: error: 'S_IWUSR' was not declared in this scope
-    S_IRUSR | S_IWUSR);
-
---- libretro.cpp.orig	2020-05-26 17:40:28.000000000 +0000
-+++ libretro.cpp
-@@ -39,6 +39,7 @@
- #endif
- 
- #if defined(HAVE_SHM) || defined(HAVE_ASHMEM)
-+#include <sys/stat.h>
- #include <fcntl.h>
- #endif
-