Update patches and dependencies. Cosmetic changes on pkgver().

4 files changed, 20 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92bcdf5ad12f..7c94cd5d6854 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p-git
 	pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI (git version)
-	pkgver = 20200604.r0.gbc57b4a
+	pkgver = 20201008.r0.g1b7a010
 	pkgrel = 1
 	url = https://m64p.github.io/
 	arch = x86_64
@@ -10,19 +10,18 @@ pkgbase = m64p-git
 	makedepends = nasm
 	makedepends = icoutils
 	depends = freetype2
-	depends = glu
 	depends = hidapi
 	depends = libgl
 	depends = libpng
 	depends = libsamplerate
 	depends = minizip
-	depends = p7zip
 	depends = qt5-base
 	depends = qt5-websockets
 	depends = sdl2
 	depends = sdl2_net
 	depends = zlib
 	depends = hicolor-icon-theme
+	optdepends = p7zip: for 7z/zip support
 	provides = m64p
 	provides = mupen64plus-gui
 	provides = mupen64plus-video-gliden64
@@ -35,8 +34,8 @@ pkgbase = m64p-git
 	source = 020-m64p-git-enable-optimizations.patch
 	source = m64p.desktop
 	sha256sums = SKIP
-	sha256sums = 9241207664cd3338ae38d02f30f7ae0f3e06c3593a50548d46bca6505181b5c2
-	sha256sums = f4cdfe23cbf35724388e8b7d2ab7f8b93cad461759588deebf46b7eb8fd2367e
+	sha256sums = b6e91689d151dfc8e60b3d095a9c20f7777b2df79083cd55a9ed43dd32dcd96b
+	sha256sums = 4366b57c9e909495d3d462eb2ce64335cbd015764be7c490fe675fbf6dfe2f84
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
 
 pkgname = m64p-git
diff --git a/010-m64p-git-remove-build-jobs-limitation.patch b/010-m64p-git-remove-build-jobs-limitation.patch
index 50b99b5430bf..955617f7cbba 100644
--- a/010-m64p-git-remove-build-jobs-limitation.patch
+++ b/010-m64p-git-remove-build-jobs-limitation.patch
@@ -45,18 +45,9 @@
  if [[ $UNAME == *"MINGW"* ]]; then
    cp $base_dir/mupen64plus-gui/build/release/mupen64plus-gui.exe $install_dir
  else
-@@ -75,7 +75,7 @@ cd $base_dir/GLideN64/src/GLideNUI
- mkdir -p build
- cd build
- qmake ../GLideNUI.pro
--make -j4
-+make
- 
- cd $base_dir/GLideN64/projects/cmake
- if [[ $UNAME == *"MINGW"* ]]; then
-@@ -83,7 +83,7 @@ if [[ $UNAME == *"MINGW"* ]]; then
+@@ -77,7 +77,7 @@ if [[ $UNAME == *"MINGW"* ]]; then
  else
-   cmake -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
+   cmake -DMUPENPLUSAPI_GLIDENUI=On -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
  fi
 -make -j4
 +make
diff --git a/020-m64p-git-enable-optimizations.patch b/020-m64p-git-enable-optimizations.patch
index 028862acfba3..1d5a404d1c02 100644
--- a/020-m64p-git-enable-optimizations.patch
+++ b/020-m64p-git-enable-optimizations.patch
@@ -9,15 +9,15 @@
  cp -P $base_dir/mupen64plus-core/projects/unix/*$suffix* $install_dir
  cp $base_dir/mupen64plus-core/data/* $install_dir
  
-@@ -79,9 +79,9 @@ make
+@@ -73,9 +73,9 @@ cd $base_dir/GLideN64/src
  
  cd $base_dir/GLideN64/projects/cmake
  if [[ $UNAME == *"MINGW"* ]]; then
--  cmake -G "MSYS Makefiles" -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
-+  cmake -G "MSYS Makefiles" -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
+-  cmake -G "MSYS Makefiles" -DMUPENPLUSAPI_GLIDENUI=On -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
++  cmake -G "MSYS Makefiles" -DMUPENPLUSAPI_GLIDENUI=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
  else
--  cmake -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
-+  cmake -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
+-  cmake -DMUPENPLUSAPI_GLIDENUI=On -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
++  cmake -DMUPENPLUSAPI_GLIDENUI=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
  fi
  make
  
diff --git a/PKGBUILD b/PKGBUILD
index 292fbf778cef..4e8b7c96e0b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p-git
-pkgver=20200604.r0.gbc57b4a
+pkgver=20201008.r0.g1b7a010
 pkgrel=1
 pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI (git version)'
 arch=('x86_64')
 url='https://m64p.github.io/'
 license=('GPL3')
-depends=('freetype2' 'glu' 'hidapi' 'libgl' 'libpng' 'libsamplerate'
-         'minizip' 'p7zip' 'qt5-base' 'qt5-websockets' 'sdl2' 'sdl2_net'
-         'zlib' 'hicolor-icon-theme')
+depends=('freetype2' 'hidapi' 'libgl' 'libpng' 'libsamplerate' 'minizip'
+         'qt5-base' 'qt5-websockets' 'sdl2' 'sdl2_net' 'zlib' 'hicolor-icon-theme')
+optdepends=('p7zip: for 7z/zip support')
 makedepends=('git' 'cmake' 'nasm' 'icoutils')
 provides=('m64p' 'mupen64plus-gui' 'mupen64plus-video-gliden64')
 conflicts=('m64p' 'mupen64plus-gui' 'mupen64plus-video-gliden64' 'mupen64plus')
@@ -18,8 +18,8 @@ source=('git+https://github.com/loganmc10/m64p.git'
         '020-m64p-git-enable-optimizations.patch'
         'm64p.desktop')
 sha256sums=('SKIP'
-            '9241207664cd3338ae38d02f30f7ae0f3e06c3593a50548d46bca6505181b5c2'
-            'f4cdfe23cbf35724388e8b7d2ab7f8b93cad461759588deebf46b7eb8fd2367e'
+            'b6e91689d151dfc8e60b3d095a9c20f7777b2df79083cd55a9ed43dd32dcd96b'
+            '4366b57c9e909495d3d462eb2ce64335cbd015764be7c490fe675fbf6dfe2f84'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
 
 prepare() {
@@ -30,14 +30,10 @@ prepare() {
 
 pkgver() {
     local _tag
-    local _ver
-    local _rev
-    local _hash
     _tag="$(git -C m64p describe --tags --abbrev='0')"
-    _ver="$(git -C m64p log -1 --format='%ad' --date='format:%Y%m%d' "$_tag")"
-    _rev="$(git -C m64p describe --tags --long | awk -F'-' '{ print $2 }')"
-    _hash="$(git -C m64p describe --tags --long | awk -F'-' '{ print $3 }')"
-    printf '%s.r%s.%s' "$_ver" "$_rev" "$_hash"
+    printf '%s.r%s.%s' "$(git -C m64p log -1 --format='%ad' --date='format:%Y%m%d' "$_tag")" \
+                       "$(git -C m64p describe --tags --long | awk -F'-' '{ print $2 }')" \
+                       "$(git -C m64p describe --tags --long | awk -F'-' '{ print $3 }')"
 }
 
 build() {