Update to version 20220720

4 files changed, 10 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e212edd483e..a59f2adc5414 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p
 	pkgdesc = Mupen64Plus with custom plugins and Qt6 GUI
-	pkgver = 20220712
+	pkgver = 20220720
 	pkgrel = 1
 	url = https://m64p.github.io/
 	arch = x86_64
@@ -30,7 +30,7 @@ pkgbase = m64p
 	provides = mupen64plus-gui
 	conflicts = mupen64plus-gui
 	conflicts = mupen64plus
-	source = git+https://github.com/loganmc10/m64p.git#tag=v2022.07.6
+	source = git+https://github.com/loganmc10/m64p.git#tag=v2022.07.10
 	source = 010-m64p-remove-build-jobs-limitation.patch
 	source = 020-m64p-change-optimizations.patch
 	source = 030-m64p-remove-bundled-discord-and-vosk.patch
@@ -40,10 +40,10 @@ pkgbase = m64p
 	source = m64p.desktop
 	sha256sums = SKIP
 	sha256sums = 038d8f811dd4632e87d4775f050dfaf0aea836c6ed4002b8ae1390b857e4e039
-	sha256sums = cc19027b19c0b516280e5e939115483ded9c7f03b1ff5f91e589e0d6bae9f735
+	sha256sums = 740b571b0cb26413c2f655c0063ad589569bb352a0ca8858c691ec81905157b5
 	sha256sums = e9da860ae7adcdd0a1cc0155c232f81ca8399e9e855bd71fb51269edb708b1cc
 	sha256sums = 4212cff6311f12ea2af5479a162a183d489dbb4107955c621a4440276a46cb76
-	sha256sums = 19304ee362dd53c62c1e0dff23876fce454340fdd2f13a948d99613d0c0dee7c
+	sha256sums = 31d99d7c6d288a5b2686c934c7d8be2e9870d5d94f0bd360d06c044037841850
 	sha256sums = a33a66612343035929eee5d6eb2acb342cc0c5a18a8e113aef83b28fb0f156c7
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
 
diff --git a/020-m64p-change-optimizations.patch b/020-m64p-change-optimizations.patch
index db1144bb77e4..de9ea1124820 100644
--- a/020-m64p-change-optimizations.patch
+++ b/020-m64p-change-optimizations.patch
@@ -1,14 +1,5 @@
 --- a/build.sh
 +++ b/build.sh
-@@ -26,7 +26,7 @@ base_dir=$PWD
- export OPTFLAGS="-O3 -flto -march=x86-64-v3"
- 
- cd $base_dir/mupen64plus-core/projects/unix
--make NETPLAY=1 NO_ASM=1 OSD=0 V=1 all
-+make NETPLAY=1 OSD=0 V=1 all
- cp -P $base_dir/mupen64plus-core/projects/unix/*$suffix* $install_dir
- cp $base_dir/mupen64plus-core/data/* $install_dir
- 
 @@ -77,9 +77,9 @@ fi
  mkdir -p $base_dir/parallel-rsp/build
  cd $base_dir/parallel-rsp/build
diff --git a/050-m64p-fix-paths.patch b/050-m64p-fix-paths.patch
index 32cae8a3e9f8..c28a23d67ae3 100644
--- a/050-m64p-fix-paths.patch
+++ b/050-m64p-fix-paths.patch
@@ -44,7 +44,7 @@
  #endif
      m64p_error res = osal_dynlib_open(&coreLib, QDir(corePath).filePath(OSAL_DEFAULT_DYNLIB_FILENAME).toUtf8().constData());
  
-@@ -1043,7 +1044,7 @@ void MainWindow::loadPlugins()
+@@ -1044,7 +1045,7 @@ void MainWindow::loadPlugins()
  #ifdef PLUGIN_DIR_PATH
      QString pluginPath = PLUGIN_DIR_PATH;
  #else
diff --git a/PKGBUILD b/PKGBUILD
index 52084fa30192..1319d2e2a7da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p
-pkgver=20220712
+pkgver=20220720
 pkgrel=1
-_tag=v2022.07.6
+_tag=v2022.07.10
 pkgdesc='Mupen64Plus with custom plugins and Qt6 GUI'
 arch=('x86_64')
 url='https://m64p.github.io/'
@@ -27,10 +27,10 @@ source=("git+https://github.com/loganmc10/m64p.git#tag=${_tag}"
         'm64p.desktop')
 sha256sums=('SKIP'
             '038d8f811dd4632e87d4775f050dfaf0aea836c6ed4002b8ae1390b857e4e039'
-            'cc19027b19c0b516280e5e939115483ded9c7f03b1ff5f91e589e0d6bae9f735'
+            '740b571b0cb26413c2f655c0063ad589569bb352a0ca8858c691ec81905157b5'
             'e9da860ae7adcdd0a1cc0155c232f81ca8399e9e855bd71fb51269edb708b1cc'
             '4212cff6311f12ea2af5479a162a183d489dbb4107955c621a4440276a46cb76'
-            '19304ee362dd53c62c1e0dff23876fce454340fdd2f13a948d99613d0c0dee7c'
+            '31d99d7c6d288a5b2686c934c7d8be2e9870d5d94f0bd360d06c044037841850'
             'a33a66612343035929eee5d6eb2acb342cc0c5a18a8e113aef83b28fb0f156c7'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
 
@@ -73,7 +73,7 @@ package() {
     local _sover
     for _component in core audio-sdl2 input-raphnetraw
     do
-        make -C "m64p/mupen64plus-${_component}/projects/unix" DESTDIR="$pkgdir" PREFIX='/usr' LDCONFIG='true' NEW_DYNAREC='0' NETPLAY='1' OSD='0' install
+        make -C "m64p/mupen64plus-${_component}/projects/unix" DESTDIR="$pkgdir" PREFIX='/usr' LDCONFIG='true' NO_ASM='1' NETPLAY='1' OSD='0' install
     done
     _sover="$(find "${pkgdir}/usr/lib" -type f -name 'libmupen64plus.so.*.*.*' | sed 's/^.*\.so\.//')"
     ln -s "libmupen64plus.so.${_sover}" "${pkgdir}/usr/lib/libmupen64plus.so"