Update to version 20210623

4 files changed, 16 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07139b37bc47..2759970e538d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p
 	pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI
-	pkgver = 20210613
+	pkgver = 20210623
 	pkgrel = 1
 	url = https://m64p.github.io/
 	arch = x86_64
@@ -27,15 +27,15 @@ pkgbase = m64p
 	provides = mupen64plus-gui
 	conflicts = mupen64plus-gui
 	conflicts = mupen64plus
-	source = git+https://github.com/loganmc10/m64p.git#tag=v2021.6.13
+	source = git+https://github.com/loganmc10/m64p.git#tag=v2021.6.23
 	source = 010-m64p-remove-build-jobs-limitation.patch
 	source = 020-m64p-change-optimizations.patch
 	source = 030-m64p-fix-paths.patch
 	source = 040-m64p-add-pie.patch
 	source = m64p.desktop
 	sha256sums = SKIP
-	sha256sums = 18cfd173f15de588285771b6159e69a07f6735d981b7326e8be52c3acce562b0
-	sha256sums = e774a0f25f951c5296a83f565384b3d788aa224537c4695e6712ae057d5a54a7
+	sha256sums = b8882d2b3cce965bd03b100fc53419ff43d8934c364136bbe63473fca0692fec
+	sha256sums = bd2964654f5c346af76a5408adc76d34bf490435c4400cfa1d2340f0ad598dcd
 	sha256sums = 4271db8d4a4c8a39373897562cf0429f20cd95d952ab8385c1b376451ea55096
 	sha256sums = 13879a08f76881c75597883c54917dbcd782ed0486050856043abaeff8ec86db
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
diff --git a/010-m64p-remove-build-jobs-limitation.patch b/010-m64p-remove-build-jobs-limitation.patch
index 6bcb468856f5..3ed70dc3e0dd 100644
--- a/010-m64p-remove-build-jobs-limitation.patch
+++ b/010-m64p-remove-build-jobs-limitation.patch
@@ -1,11 +1,11 @@
 --- a/build.sh
 +++ b/build.sh
-@@ -24,18 +24,18 @@ mkdir -p $install_dir
+@@ -26,18 +26,18 @@ mkdir -p $install_dir
  base_dir=$PWD
  
  cd $base_dir/mupen64plus-core/projects/unix
--make NETPLAY=1 OSD=0 NO_ASM=1 -j4 all
-+make NETPLAY=1 OSD=0 NO_ASM=1 all
+-make NETPLAY=1 OSD=0 -j4 all
++make NETPLAY=1 OSD=0 all
  cp -P $base_dir/mupen64plus-core/projects/unix/*$suffix* $install_dir
  cp $base_dir/mupen64plus-core/data/* $install_dir
  
@@ -22,7 +22,7 @@
  if [[ $UNAME == *"MINGW"* ]]; then
    cp $base_dir/mupen64plus-input-qt/build/release/mupen64plus-input-qt.dll $install_dir
  else
-@@ -43,7 +43,7 @@ else
+@@ -45,7 +45,7 @@ else
  fi
  
  cd $base_dir/mupen64plus-audio-sdl2/projects/unix
@@ -31,7 +31,7 @@
  cp $base_dir/mupen64plus-audio-sdl2/projects/unix/*$suffix $install_dir
  
  cd $base_dir
-@@ -62,7 +62,7 @@ fi
+@@ -64,7 +64,7 @@ fi
  mkdir -p $base_dir/mupen64plus-gui/build
  cd $base_dir/mupen64plus-gui/build
  qmake ../mupen64plus-gui.pro
diff --git a/020-m64p-change-optimizations.patch b/020-m64p-change-optimizations.patch
index 4dbf4b046a46..c383e3a2214f 100644
--- a/020-m64p-change-optimizations.patch
+++ b/020-m64p-change-optimizations.patch
@@ -1,15 +1,6 @@
 --- a/build.sh
 +++ b/build.sh
-@@ -24,7 +24,7 @@ mkdir -p $install_dir
- base_dir=$PWD
- 
- cd $base_dir/mupen64plus-core/projects/unix
--make NETPLAY=1 OSD=0 NO_ASM=1 all
-+make NETPLAY=1 OSD=0 all
- cp -P $base_dir/mupen64plus-core/projects/unix/*$suffix* $install_dir
- cp $base_dir/mupen64plus-core/data/* $install_dir
- 
-@@ -75,9 +75,9 @@ fi
+@@ -77,9 +77,9 @@ fi
  mkdir -p $base_dir/parallel-rsp/build
  cd $base_dir/parallel-rsp/build
  if [[ $UNAME == *"MINGW"* ]]; then
@@ -21,7 +12,7 @@
  fi
  cmake --build .
  cp mupen64plus-rsp-parallel.* $install_dir
-@@ -85,9 +85,9 @@ cp mupen64plus-rsp-parallel.* $install_dir
+@@ -87,9 +87,9 @@ cp mupen64plus-rsp-parallel.* $install_dir
  mkdir -p $base_dir/parallel-rdp-standalone/build
  cd $base_dir/parallel-rdp-standalone/build
  if [[ $UNAME == *"MINGW"* ]]; then
diff --git a/PKGBUILD b/PKGBUILD
index ee4b2259b2fb..95e8e929c476 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p
-pkgver=20210613
+pkgver=20210623
 pkgrel=1
 pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI'
 arch=('x86_64')
@@ -22,8 +22,8 @@ source=("git+https://github.com/loganmc10/m64p.git#tag=${_tag}"
         '040-m64p-add-pie.patch'
         'm64p.desktop')
 sha256sums=('SKIP'
-            '18cfd173f15de588285771b6159e69a07f6735d981b7326e8be52c3acce562b0'
-            'e774a0f25f951c5296a83f565384b3d788aa224537c4695e6712ae057d5a54a7'
+            'b8882d2b3cce965bd03b100fc53419ff43d8934c364136bbe63473fca0692fec'
+            'bd2964654f5c346af76a5408adc76d34bf490435c4400cfa1d2340f0ad598dcd'
             '4271db8d4a4c8a39373897562cf0429f20cd95d952ab8385c1b376451ea55096'
             '13879a08f76881c75597883c54917dbcd782ed0486050856043abaeff8ec86db'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
@@ -58,12 +58,13 @@ 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' OSD='0' install
+        make -C "m64p/mupen64plus-${_component}/projects/unix" DESTDIR="$pkgdir" PREFIX='/usr' LDCONFIG='true' NEW_DYNAREC='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"
     
     # other plugins and components
     install -D -m644 m64p/mupen64plus/libdiscord_game_sdk.so -t "${pkgdir}/usr/lib"
+    install -D -m644 m64p/mupen64plus-input-qt/vosk/libvosk.so -t "${pkgdir}/usr/lib/mupen64plus"
     install -D -m644 m64p/mupen64plus/mupen64plus-{input-qt,{rsp,video}-parallel}.so -t "${pkgdir}/usr/lib/mupen64plus"
 }