Remove a now unneeded patch. Update dependencies.

References
----------
[1] https://github.com/mupen64plus/mupen64plus-ui-console/commit/7b236510288eece4cb824d9155005f83d1e4d0d2
[2] https://github.com/mupen64plus/mupen64plus-ui-console/commit/20cdcb37551872cd6407dafff9853a6b049c9a6b
[3] https://github.com/mupen64plus/mupen64plus-ui-console/commit/32e27344214946f0dce3cd2b4fff152a3538bd8f

4 files changed, 21 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a52b84e8ddc9..284494749118 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 pkgbase = mupen64plus-git
 	pkgdesc = Nintendo64 Emulator (git version)
-	pkgver = 2.5.9.r70.g4edc53c2.20200422.041041
+	pkgver = 2.5.9.r164.gaf812317.20210102.183932
 	pkgrel = 1
 	url = https://www.mupen64plus.org/
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = nasm
-	makedepends = mesa
 	makedepends = boost
-	depends = speexdsp
-	depends = minizip
-	depends = sdl2
+	makedepends = mesa
+	depends = boost-libs
+	depends = freetype2
 	depends = glu
-	depends = libsamplerate
+	depends = libgl
 	depends = libpng
-	depends = freetype2
-	depends = boost-libs
+	depends = libsamplerate
+	depends = minizip
+	depends = sdl2
+	depends = speexdsp
+	depends = zlib
 	depends = hicolor-icon-theme
-	depends = desktop-file-utils
 	provides = mupen64plus
 	conflicts = mupen64plus
 	source = git+https://github.com/mupen64plus/mupen64plus-core.git
@@ -28,8 +29,7 @@ pkgbase = mupen64plus-git
 	source = git+https://github.com/mupen64plus/mupen64plus-audio-sdl.git
 	source = git+https://github.com/mupen64plus/mupen64plus-input-sdl.git
 	source = git+https://github.com/mupen64plus/mupen64plus-ui-console.git
-	source = mupen64plus-git-install-fix.patch
-	source = mupen64plus-git-ui-console-pie.patch
+	source = 010-mupen64plus-git-install-fix.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -37,8 +37,7 @@ pkgbase = mupen64plus-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = d45208a1d9e5a08e6711739c9f52bd88ff016fa5c382a85f305cd4b69dbf62d1
-	sha256sums = e0e6b47aa5ea7b72f2bd5d5ad5e42fee870d947177f2b7e0137b6a93540b894d
+	sha256sums = 57d44edf46bafc6dbdf82e6db204c50bac1c2ea5c07aef7d3f84818f87e671a5
 
 pkgname = mupen64plus-git
 
diff --git a/mupen64plus-git-install-fix.patch b/010-mupen64plus-git-install-fix.patch
index 2cdf2f3fa96e..3c61e6d5894f 100644
--- a/mupen64plus-git-install-fix.patch
+++ b/010-mupen64plus-git-install-fix.patch
@@ -1,6 +1,5 @@
-diff -Naurp a/m64p_install.sh b/m64p_install.sh
---- a/m64p_install.sh	2013-02-26 20:22:09.000000000 +0000
-+++ b/m64p_install.sh	2018-12-31 12:20:39.000000000 +0000
+--- a/m64p_install.sh
++++ b/m64p_install.sh
 @@ -43,5 +43,5 @@ for component in ${M64P_COMPONENTS}; do
  	fi
  
diff --git a/PKGBUILD b/PKGBUILD
index a75bfc7e93df..4de5f93b2654 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,15 @@
 # mupen64plus component receives a new commit.
 
 pkgname=mupen64plus-git
-pkgver=2.5.9.r70.g4edc53c2.20200422.041041
+pkgver=2.5.9.r164.gaf812317.20210102.183932
 pkgrel=1
 pkgdesc='Nintendo64 Emulator (git version)'
 arch=('x86_64')
 url='https://www.mupen64plus.org/'
 license=('GPL')
-depends=('speexdsp' 'minizip' 'sdl2' 'glu' 'libsamplerate' 'libpng'
-         'freetype2' 'boost-libs' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('git' 'nasm' 'mesa' 'boost')
+depends=('boost-libs' 'freetype2' 'glu' 'libgl' 'libpng' 'libsamplerate'
+         'minizip' 'sdl2' 'speexdsp' 'zlib' 'hicolor-icon-theme')
+makedepends=('git' 'nasm' 'boost' 'mesa')
 provides=('mupen64plus')
 conflicts=('mupen64plus')
 source=('git+https://github.com/mupen64plus/mupen64plus-core.git'
@@ -25,8 +25,7 @@ source=('git+https://github.com/mupen64plus/mupen64plus-core.git'
         'git+https://github.com/mupen64plus/mupen64plus-audio-sdl.git'
         'git+https://github.com/mupen64plus/mupen64plus-input-sdl.git'
         'git+https://github.com/mupen64plus/mupen64plus-ui-console.git'
-        'mupen64plus-git-install-fix.patch'
-        'mupen64plus-git-ui-console-pie.patch')
+        '010-mupen64plus-git-install-fix.patch')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -34,8 +33,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'd45208a1d9e5a08e6711739c9f52bd88ff016fa5c382a85f305cd4b69dbf62d1'
-            'e0e6b47aa5ea7b72f2bd5d5ad5e42fee870d947177f2b7e0137b6a93540b894d')
+            '57d44edf46bafc6dbdf82e6db204c50bac1c2ea5c07aef7d3f84818f87e671a5')
 
 _m64p_components='core rsp-hle video-rice video-glide64mk2 audio-sdl input-sdl ui-console'
 
@@ -44,10 +42,7 @@ prepare() {
     bsdtar -xf "${srcdir}/mupen64plus-core/tools/m64p_helper_scripts.tar.gz" m64p_install.sh
     
     # remove uneedeed 'source' directory references from install script
-    patch -Np1 -i mupen64plus-git-install-fix.patch
-    
-    # enable PIE for ui-console interface
-    patch -Np1 -i mupen64plus-git-ui-console-pie.patch
+    patch -Np1 -i 010-mupen64plus-git-install-fix.patch
 }
 
 pkgver() {
diff --git a/mupen64plus-git-ui-console-pie.patch b/mupen64plus-git-ui-console-pie.patch
deleted file mode 100644
index cf9c7cc0a80c..000000000000
--- a/mupen64plus-git-ui-console-pie.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naurp a/mupen64plus-ui-console/projects/unix/Makefile b/mupen64plus-ui-console/projects/unix/Makefile
---- a/mupen64plus-ui-console/projects/unix/Makefile	2018-12-31 12:43:25.555935332 +0000
-+++ b/mupen64plus-ui-console/projects/unix/Makefile	2018-12-31 12:54:54.172782742 +0000
-@@ -175,15 +175,6 @@ LINK.o = $(Q_LD)$(CC) $(CFLAGS) $(LDFLAG
- ifeq ($(PIE), 1)
-   CFLAGS += -fPIE
-   LDFLAGS += -pie
--else
--  CFLAGS += -fno-PIE
--  ifeq ($(CC),$(CROSS_COMPILE)gcc)
--    # check if PIE is the default for the compiler
--    PIE_DEFAULT = $(shell $(CC) -v 2>&1 | grep enable-default-pie)
--    ifneq ($(PIE_DEFAULT),)
--      LDFLAGS += -no-pie
--    endif
--  endif
- endif
- 
- # set installation options