libretro-genesis-plus-gx: Update to latest snapshot.

Many many changes to the internal emulator code, but the important thing
is that this builds again.

4 files changed, 42 insertions, 61 deletions

diff --git a/emulators/libretro-genesis-plus-gx/Makefile b/emulators/libretro-genesis-plus-gx/Makefile
index 62ee632f3f2..4eb5460d3a9 100644
--- a/emulators/libretro-genesis-plus-gx/Makefile
+++ b/emulators/libretro-genesis-plus-gx/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2022/09/11 12:51:32 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/09/17 11:53:42 nia Exp $
 
-DISTNAME=	libretro-genesis-plus-gx-20200208
-PKGREVISION=	2
+DISTNAME=	libretro-genesis-plus-gx-20220901
 CATEGORIES=	emulators
 GITHUB_PROJECT=	Genesis-Plus-GX
-GITHUB_TAG=	50551066f71f8a5ea782ea3747891fd6d24ebe67
+GITHUB_TAG=	aea7b9d5475ec02427fbb00a9093cae74b87ff8a
 
 MAINTAINER=	nia@NetBSD.org
 HOMEPAGE=	https://docs.libretro.com/library/genesis_plus_gx/
 COMMENT=	Libretro core based on the Genesis Plus Sega 8/16 bit emulator
 LICENSE=	mame-license
 
-LDFLAGS+=	-lFLAC -lz
+LDFLAGS+=	-lz
 
 LIBRETRO_CORE=	genesis_plus_gx
 
@@ -27,7 +26,6 @@ MAKE_FLAGS+=	ENDIANNESS_DEFINES="-DBYTE_ORDER=BIG_ENDIAN -DCPU_IS_BIG_ENDIAN=1 -
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./libretro/link.T
 
-.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/libretro-genesis-plus-gx/distinfo b/emulators/libretro-genesis-plus-gx/distinfo
index 1b19cc606b1..7712a128216 100644
--- a/emulators/libretro-genesis-plus-gx/distinfo
+++ b/emulators/libretro-genesis-plus-gx/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:23:55 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/09/17 11:53:42 nia Exp $
 
-BLAKE2s (libretro-genesis-plus-gx-20200208-50551066f71f8a5ea782ea3747891fd6d24ebe67.tar.gz) = 1f354eb6b98dffa1ec6a643279016e938f7d4408858d39f71190f7354f372d77
-SHA512 (libretro-genesis-plus-gx-20200208-50551066f71f8a5ea782ea3747891fd6d24ebe67.tar.gz) = bc5f0b0b4f6c5077fa90bb18e78f79baa08e6253eadce13b1ca0d884c54d2c2669b53e856feb05f2293a4b642707773df155a4393a8a64db766f805a2b71d63a
-Size (libretro-genesis-plus-gx-20200208-50551066f71f8a5ea782ea3747891fd6d24ebe67.tar.gz) = 6506880 bytes
-SHA1 (patch-Makefile.libretro) = d48bd0e6e752ecc44de1d78eb49cbcc7515b6999
-SHA1 (patch-libretro_Makefile.common) = c32fdd3a80a75c44ddeb2678b7d5579e8a045717
+BLAKE2s (libretro-genesis-plus-gx-20220901-aea7b9d5475ec02427fbb00a9093cae74b87ff8a.tar.gz) = 2bdc40da84b1617bd4cd97f1923f8913cac6a14fa9ace1f287515dbee52fe154
+SHA512 (libretro-genesis-plus-gx-20220901-aea7b9d5475ec02427fbb00a9093cae74b87ff8a.tar.gz) = 9d06f6d6f49bb0e63f631c53e52a35a2b6959eef94911923032f47e81ca9862c2f99264b67f28a9e55883f80d7b6296d1499ef5866b53a3fa13798a7975a03bf
+Size (libretro-genesis-plus-gx-20220901-aea7b9d5475ec02427fbb00a9093cae74b87ff8a.tar.gz) = 14207056 bytes
+SHA1 (patch-Makefile.libretro) = fd38f35cb4f82dd1d6f25402dc204df20168fdbf
+SHA1 (patch-libretro_Makefile.common) = da1f91e2db5e813c42db44e670ce59acf7e821df
diff --git a/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro b/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro
index b362dbd82a9..245791c4347 100644
--- a/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro
+++ b/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro
@@ -1,15 +1,17 @@
-$NetBSD: patch-Makefile.libretro,v 1.1 2020/06/01 19:12:38 nia Exp $
+$NetBSD: patch-Makefile.libretro,v 1.2 2022/09/17 11:53:42 nia Exp $
 
-This is not C++.
+Do not force -O2.
 
---- Makefile.libretro.orig	2020-02-08 21:59:22.000000000 +0000
+--- Makefile.libretro.orig	2022-09-01 18:13:56.000000000 +0000
 +++ Makefile.libretro
-@@ -715,7 +715,7 @@ else
- 	LD = link.exe
+@@ -772,8 +772,8 @@ ifneq (,$(findstring msvc,$(platform)))
+    CFLAGS   += -MT
+    CXXFLAGS += -MT
  endif
- else
--	LD = $(CXX)
-+	LD = $(CC)
+-   CFLAGS   += -O2 -DNDEBUG
+-   CXXFLAGS += -O2 -DNDEBUG
++   CFLAGS   += -DNDEBUG
++   CXXFLAGS += -DNDEBUG
  endif
  
- ifeq ($(platform), theos_ios)
+ ifeq ($(SHARED_LIBVORBIS),)
diff --git a/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common b/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common
index 8591cf79223..4e8d6387270 100644
--- a/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common
+++ b/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common
@@ -1,50 +1,31 @@
-$NetBSD: patch-libretro_Makefile.common,v 1.1 2020/06/01 19:12:38 nia Exp $
+$NetBSD: patch-libretro_Makefile.common,v 1.2 2022/09/17 11:53:42 nia Exp $
 
-Don't use bundled deps.
+Use external zlib.
 
---- libretro/Makefile.common.orig	2020-02-08 21:59:22.000000000 +0000
+--- libretro/Makefile.common.orig	2022-09-01 18:13:56.000000000 +0000
 +++ libretro/Makefile.common
-@@ -18,30 +18,13 @@ endif
- 
+@@ -24,8 +24,7 @@ endif
  ifeq ($(HAVE_CHD), 1)
-    INCFLAGS += -I$(CHDLIBDIR)/src \
--					-I$(CHDLIBDIR)/deps/libFLAC/include \
--					-I$(CHDLIBDIR)/deps/lzma \
--					-I$(CHDLIBDIR)/deps/zlib
-+					-I$(CHDLIBDIR)/deps/lzma
+    INCFLAGS += \
+                -I$(LIBRETRO_DEPS_DIR)/libchdr/include \
+-               -I$(LIBRETRO_DEPS_DIR)/lzma-19.00/include \
+-               -I$(LIBRETRO_DEPS_DIR)/zlib-1.2.11
++               -I$(LIBRETRO_DEPS_DIR)/lzma-19.00/include
     SOURCES_C += \
- 					 $(CHDLIBDIR)/src/bitstream.c \
- 					 $(CHDLIBDIR)/src/cdrom.c \
- 					 $(CHDLIBDIR)/src/chd.c \
- 					 $(CHDLIBDIR)/src/flac.c \
- 					 $(CHDLIBDIR)/src/huffman.c \
--					 $(CHDLIBDIR)/deps/libFLAC/bitmath.c \
--					 $(CHDLIBDIR)/deps/libFLAC/bitreader.c \
--					 $(CHDLIBDIR)/deps/libFLAC/cpu.c \
--					 $(CHDLIBDIR)/deps/libFLAC/crc.c \
--					 $(CHDLIBDIR)/deps/libFLAC/fixed.c \
--					 $(CHDLIBDIR)/deps/libFLAC/float.c \
--					 $(CHDLIBDIR)/deps/libFLAC/format.c \
--					 $(CHDLIBDIR)/deps/libFLAC/lpc.c \
--					 $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_avx2.c \
--					 $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_sse.c \
--					 $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_sse2.c \
--					 $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_sse41.c \
--					 $(CHDLIBDIR)/deps/libFLAC/md5.c \
--					 $(CHDLIBDIR)/deps/libFLAC/memory.c \
--					 $(CHDLIBDIR)/deps/libFLAC/stream_decoder.c \
- 					 $(CHDLIBDIR)/deps/lzma/LzFind.c \
- 					 $(CHDLIBDIR)/deps/lzma/LzmaDec.c \
- 					 $(CHDLIBDIR)/deps/lzma/LzmaEnc.c
-@@ -82,11 +65,6 @@ SOURCES_C += \
+                 $(LIBRETRO_DEPS_DIR)/lzma-19.00/src/Alloc.c \
+                 $(LIBRETRO_DEPS_DIR)/lzma-19.00/src/Bra86.c \
+@@ -74,14 +73,6 @@ SOURCES_C += \
+ 				 $(LIBRETRO_COMM_DIR)/cdrom/cdrom.c \
  				 $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_cdrom.c
  endif
- 
--SOURCES_C += $(CHDLIBDIR)/deps/zlib/adler32.c \
--				 $(CHDLIBDIR)/deps/zlib/inffast.c \
--				 $(CHDLIBDIR)/deps/zlib/inflate.c \
--				 $(CHDLIBDIR)/deps/zlib/inftrees.c \
--				 $(CHDLIBDIR)/deps/zlib/zutil.c
+-SOURCES_C += \
+-             $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/adler32.c \
+-             $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/crc32.c \
+-             $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/inffast.c \
+-             $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/inflate.c \
+-             $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/inftrees.c \
+-             $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/zutil.c
+-
  endif
  
  ifeq ($(SHARED_LIBVORBIS),)