Update to version 20201027

4 files changed, 13 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92dce0e062c9..a5894c4677e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p
 	pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI
-	pkgver = 20201020
+	pkgver = 20201027
 	pkgrel = 1
 	url = https://m64p.github.io/
 	arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = m64p
 	makedepends = git
 	makedepends = cmake
 	makedepends = nasm
+	makedepends = zip
 	makedepends = icoutils
 	depends = freetype2
 	depends = hidapi
@@ -27,7 +28,7 @@ pkgbase = m64p
 	conflicts = mupen64plus-gui
 	conflicts = mupen64plus-video-gliden64
 	conflicts = mupen64plus
-	source = git+https://github.com/loganmc10/m64p.git#commit=2aa2588a91d5ca97d6fa97dbdffa05bcd88583f6
+	source = git+https://github.com/loganmc10/m64p.git#commit=1367455caf8423c03785254df60cf294144bc47c
 	source = 010-m64p-remove-build-jobs-limitation.patch
 	source = 020-m64p-enable-optimizations.patch
 	source = 030-m64p-fix-default-config-paths.patch
@@ -36,8 +37,8 @@ pkgbase = m64p
 	sha256sums = SKIP
 	sha256sums = 28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04
 	sha256sums = d3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3
-	sha256sums = c3f932cfe90909bd2f69a352add4acdd4d67d1fb73559d651de3cec3acdc3737
-	sha256sums = 06915a74819512b423ce9c8b3717ce4132836d3b691500f0298810b92ba7ac2c
+	sha256sums = 5f2e645cf807e42b41da98576e16562289b5abb2b933b0ea27c2aa48e8d177e2
+	sha256sums = 132130e28c303647d61e3c52420d14c0c8f04115b1b0937e67bcd07d078a19f4
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
 
 pkgname = m64p
diff --git a/030-m64p-fix-default-config-paths.patch b/030-m64p-fix-default-config-paths.patch
index 1c32a2f7b4af..bb9dc93ffd00 100644
--- a/030-m64p-fix-default-config-paths.patch
+++ b/030-m64p-fix-default-config-paths.patch
@@ -8,7 +8,7 @@
  #include "settingsdialog.h"
  #include "plugindialog.h"
  #include "mainwindow.h"
-@@ -406,11 +407,11 @@ MainWindow::MainWindow(QWidget *parent) :
+@@ -407,11 +408,11 @@ MainWindow::MainWindow(QWidget *parent) :
      updatePIF(ui);
  
      if (!settings->contains("coreLibPath"))
diff --git a/040-m64p-add-pie.patch b/040-m64p-add-pie.patch
index 16aa3626d2e8..f26a70263bbb 100644
--- a/040-m64p-add-pie.patch
+++ b/040-m64p-add-pie.patch
@@ -1,6 +1,6 @@
 --- a/mupen64plus-gui/mupen64plus-gui.pro
 +++ b/mupen64plus-gui/mupen64plus-gui.pro
-@@ -89,8 +89,6 @@ FORMS    += mainwindow.ui
+@@ -93,8 +93,6 @@ FORMS    += mainwindow.ui
  
  QMAKE_INCDIR += api interface
  
diff --git a/PKGBUILD b/PKGBUILD
index 4e697fa10f23..690daaf918fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p
-pkgver=20201020
+pkgver=20201027
 pkgrel=1
 pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI'
 arch=('x86_64')
@@ -10,10 +10,10 @@ license=('GPL3')
 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')
+makedepends=('git' 'cmake' 'nasm' 'zip' 'icoutils')
 provides=('mupen64plus-gui' 'mupen64plus-video-gliden64')
 conflicts=('mupen64plus-gui' 'mupen64plus-video-gliden64' 'mupen64plus')
-_commit=2aa2588a91d5ca97d6fa97dbdffa05bcd88583f6
+_commit=1367455caf8423c03785254df60cf294144bc47c
 source=("git+https://github.com/loganmc10/m64p.git#commit=${_commit}"
         '010-m64p-remove-build-jobs-limitation.patch'
         '020-m64p-enable-optimizations.patch'
@@ -23,8 +23,8 @@ source=("git+https://github.com/loganmc10/m64p.git#commit=${_commit}"
 sha256sums=('SKIP'
             '28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04'
             'd3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3'
-            'c3f932cfe90909bd2f69a352add4acdd4d67d1fb73559d651de3cec3acdc3737'
-            '06915a74819512b423ce9c8b3717ce4132836d3b691500f0298810b92ba7ac2c'
+            '5f2e645cf807e42b41da98576e16562289b5abb2b933b0ea27c2aa48e8d177e2'
+            '132130e28c303647d61e3c52420d14c0c8f04115b1b0937e67bcd07d078a19f4'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
 
 prepare() {
@@ -48,7 +48,7 @@ package() {
     install -D -m644 m64p.desktop -t "${pkgdir}/usr/share/applications"
     while read -r -d '' _file
     do
-        _res="$(printf '%s' "$_file" | sed 's/\.png$//;s/^.*_//;s/x.*$//')"
+        _res="$(sed 's/\.png$//;s/^.*_//;s/x.*$//' <<< "$_file")"
         install -D -m644 "$_file" "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/apps/mupen64plus.png"
     done < <(find m64p/mupen64plus-gui -maxdepth 1 -type f -name 'mupen64plus_*_*x*x*.png' -print0)