libretro-mupen64plus: Update to 20190426

The primary changes are the introduction of an aarch64 dynamic recompiler,
a performance fix for radeonsi, and a new 1440x1080 4:3 resolution option.

4 files changed, 94 insertions, 12 deletions

diff --git a/emulators/libretro-mupen64plus/Makefile b/emulators/libretro-mupen64plus/Makefile
index a9e6f6d85e4..e0e843f0f09 100644
--- a/emulators/libretro-mupen64plus/Makefile
+++ b/emulators/libretro-mupen64plus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2019/05/18 09:45:17 nia Exp $
+# $NetBSD: Makefile,v 1.18 2019/05/18 10:34:33 nia Exp $
 
-DISTNAME=	libretro-mupen64plus-20181013
+DISTNAME=	libretro-mupen64plus-20190426
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
 GITHUB_PROJECT=	mupen64plus-libretro
-GITHUB_TAG=	e7ea1ae1f7a6e9913a46946e322d1a2f6d8c4ae0
+GITHUB_TAG=	af7a4bf219ded4036257a92060b146d7d4333f0f
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://docs.libretro.com/library/mupen64plus/
@@ -22,17 +22,25 @@ SUBST_FILES.vc=		Makefile
 SUBST_SED.vc+=		-e 's;/opt/vc;${PREFIX};g'
 
 MAKE_FLAGS+=		GIT_VERSION="-pkgsrc"
+MAKE_FLAGS+=		platform="unix"
 
 .if !empty(MACHINE_ARCH:M*arm*)
 MAKE_FLAGS+=	WITH_DYNAREC=arm
+MAKE_FLAGS+=	PIC=1
 .elif ${MACHINE_ARCH} == "i386"
 MAKE_FLAGS+=	WITH_DYNAREC=x86
+MAKE_FLAGS+=	PIC=0
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 .elif ${MACHINE_ARCH} == "x86_64"
 MAKE_FLAGS+=	WITH_DYNAREC=x86_64
+MAKE_FLAGS+=	PIC=1
+.elif ${MACHINE_ARCH} == "aarch64"
+MAKE_FLAGS+=	WITH_DYNAREC=aarch64
+MAKE_FLAGS+=	PIC=1
 .else
 MAKE_FLAGS+=	WITH_DYNAREC=
 MAKE_FLAGS+=	DYNAREC_USED=0
+MAKE_FLAGS+=	PIC=1
 .endif
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./libretro/link.T
diff --git a/emulators/libretro-mupen64plus/distinfo b/emulators/libretro-mupen64plus/distinfo
index 2304fca32b8..52d50d2688d 100644
--- a/emulators/libretro-mupen64plus/distinfo
+++ b/emulators/libretro-mupen64plus/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2018/10/14 16:51:57 nia Exp $
+$NetBSD: distinfo,v 1.9 2019/05/18 10:34:33 nia Exp $
 
-SHA1 (libretro-mupen64plus-20181013-e7ea1ae1f7a6e9913a46946e322d1a2f6d8c4ae0.tar.gz) = 4ec744d0bb0cf8cc6e6ee54dbcd5a5902507ea16
-RMD160 (libretro-mupen64plus-20181013-e7ea1ae1f7a6e9913a46946e322d1a2f6d8c4ae0.tar.gz) = 11fd1f65b5fe66a1a7f12dd87bed62867062d35c
-SHA512 (libretro-mupen64plus-20181013-e7ea1ae1f7a6e9913a46946e322d1a2f6d8c4ae0.tar.gz) = 220ef080a39282b06d03c945cc4545dbf70148d460080dab43dff6659eaf4b0a6d7925721b31ff56237088a32637734022f3209897e150a5b25b60683cdb427a
-Size (libretro-mupen64plus-20181013-e7ea1ae1f7a6e9913a46946e322d1a2f6d8c4ae0.tar.gz) = 6216253 bytes
+SHA1 (libretro-mupen64plus-20190426-af7a4bf219ded4036257a92060b146d7d4333f0f.tar.gz) = 87dbe77d476a24d0ce9549339c1c905f21ffafd8
+RMD160 (libretro-mupen64plus-20190426-af7a4bf219ded4036257a92060b146d7d4333f0f.tar.gz) = 0f58146cf8eaf0a099da5b5754849286809315b9
+SHA512 (libretro-mupen64plus-20190426-af7a4bf219ded4036257a92060b146d7d4333f0f.tar.gz) = e2ec7863eca3365bc1b6f9dd53a31d4cfb19072379d9fc16f9c90580a8427a810ad16cf3851f80483d9f50625f649ed8538f75e9d4e9630edcf46de9f105fa9c
+Size (libretro-mupen64plus-20190426-af7a4bf219ded4036257a92060b146d7d4333f0f.tar.gz) = 7150733 bytes
+SHA1 (patch-Makefile) = 476c58c1d549d66001afbd9237eaface4e208ce8
diff --git a/emulators/libretro-mupen64plus/options.mk b/emulators/libretro-mupen64plus/options.mk
index 93980cb0eba..ee7726f3abb 100644
--- a/emulators/libretro-mupen64plus/options.mk
+++ b/emulators/libretro-mupen64plus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2018/08/16 13:25:27 nia Exp $
+# $NetBSD: options.mk,v 1.9 2019/05/18 10:34:33 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libretro-mupen64plus
 PKG_OPTIONS_REQUIRED_GROUPS=	graphics
@@ -18,9 +18,13 @@ PKG_SUGGESTED_OPTIONS+=		opengl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mopengl)
-.include "../../graphics/MesaLib/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mrpi)
+.if !empty(PKG_OPTIONS:Mrpi)
 MAKE_ENV+=	platform=rpi
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
+.else
+MAKE_ENV+=	platform=unix
+.endif
+
+.if !empty(PKG_OPTIONS:Mopengl)
+.include "../../graphics/MesaLib/buildlink3.mk"
 .endif
diff --git a/emulators/libretro-mupen64plus/patches/patch-Makefile b/emulators/libretro-mupen64plus/patches/patch-Makefile
new file mode 100644
index 00000000000..f6db1ac4b68
--- /dev/null
+++ b/emulators/libretro-mupen64plus/patches/patch-Makefile
@@ -0,0 +1,69 @@
+$NetBSD: patch-Makefile,v 1.1 2019/05/18 10:34:33 nia Exp $
+
+Do not make guesses based on uname.
+
+--- Makefile.orig	2019-04-26 23:01:28.000000000 +0000
++++ Makefile
+@@ -9,62 +9,10 @@ COREFLAGS :=
+ CPUFLAGS  :=
+ GLFLAGS   :=
+ 
+-UNAME=$(shell uname -a)
+-
+ # Dirs
+ ROOT_DIR := .
+ LIBRETRO_DIR := $(ROOT_DIR)/libretro
+ 
+-ifeq ($(platform),)
+-   platform = unix
+-   ifeq ($(UNAME),)
+-      platform = win
+-   else ifneq ($(findstring MINGW,$(UNAME)),)
+-      platform = win
+-   else ifneq ($(findstring Darwin,$(UNAME)),)
+-      platform = osx
+-   else ifneq ($(findstring win,$(UNAME)),)
+-      platform = win
+-   endif
+-else ifneq (,$(findstring armv,$(platform)))
+-    ifeq (,$(findstring classic_,$(platform)))
+-        override platform += unix
+-    endif
+-endif
+-
+-# system platform
+-system_platform = unix
+-ifeq ($(shell uname -a),)
+-   EXE_EXT = .exe
+-   system_platform = win
+-else ifneq ($(findstring Darwin,$(shell uname -a)),)
+-   system_platform = osx
+-   arch = intel
+-ifeq ($(shell uname -p),powerpc)
+-   arch = ppc
+-endif
+-else ifneq ($(findstring MINGW,$(shell uname -a)),)
+-   system_platform = win
+-endif
+-
+-# Cross compile?
+-ifeq (,$(ARCH))
+-   ARCH = $(shell uname -m)
+-endif
+-
+-# Target Dynarec
+-WITH_DYNAREC = $(ARCH)
+-
+-PIC = 1
+-ifeq ($(ARCH), $(filter $(ARCH), i386 i686))
+-   WITH_DYNAREC = x86
+-   PIC = 0
+-else ifeq ($(ARCH), $(filter $(ARCH), arm))
+-   WITH_DYNAREC = arm
+-else ifeq ($(ARCH), $(filter $(ARCH), aarch64))
+-   WITH_DYNAREC = aarch64
+-endif
+-
+ TARGET_NAME := mupen64plus
+ CC_AS ?= $(CC)
+