Update to version 20220706

3 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29ceb254a9ad..015b55a40cb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p
-	pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI
-	pkgver = 20220701
+	pkgdesc = Mupen64Plus with custom plugins and Qt6 GUI
+	pkgver = 20220706
 	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.1
+	source = git+https://github.com/loganmc10/m64p.git#tag=v2022.07.3
 	source = 010-m64p-remove-build-jobs-limitation.patch
 	source = 020-m64p-change-optimizations.patch
 	source = 030-m64p-remove-bundled-discord-and-vosk.patch
@@ -43,7 +43,7 @@ pkgbase = m64p
 	sha256sums = cc19027b19c0b516280e5e939115483ded9c7f03b1ff5f91e589e0d6bae9f735
 	sha256sums = e9da860ae7adcdd0a1cc0155c232f81ca8399e9e855bd71fb51269edb708b1cc
 	sha256sums = 4212cff6311f12ea2af5479a162a183d489dbb4107955c621a4440276a46cb76
-	sha256sums = 1a03b73ff9b447c717d59115a33e63ad49c0256eb9992ef541b4a3c5e31765c5
+	sha256sums = 9768f722425649d4125be53da1a9a5fe1206419fee751ba74d7a06fd04c7c57e
 	sha256sums = a33a66612343035929eee5d6eb2acb342cc0c5a18a8e113aef83b28fb0f156c7
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
 
diff --git a/050-m64p-fix-paths.patch b/050-m64p-fix-paths.patch
index 225be809741a..4e3bccb56cbc 100644
--- a/050-m64p-fix-paths.patch
+++ b/050-m64p-fix-paths.patch
@@ -17,7 +17,7 @@
  #endif
      QDir PluginDir(pluginPath);
      PluginDir.setFilter(QDir::Files);
-@@ -375,7 +376,7 @@ MainWindow::MainWindow(QWidget *parent) :
+@@ -372,7 +373,7 @@ MainWindow::MainWindow(QWidget *parent) :
      updatePIF(ui);
  
      if (!settings->contains("configDirPath"))
@@ -26,7 +26,7 @@
  
  #ifdef CONFIG_DIR_PATH
      settings->setValue("configDirPath", CONFIG_DIR_PATH);
-@@ -435,7 +436,7 @@ void MainWindow::updateApp()
+@@ -432,7 +433,7 @@ void MainWindow::updateApp()
  
  void MainWindow::setupDiscord()
  {
@@ -35,7 +35,7 @@
  
      memset(&discord_app, 0, sizeof(discord_app));
  
-@@ -954,7 +955,7 @@ void MainWindow::loadCoreLib()
+@@ -951,7 +952,7 @@ void MainWindow::loadCoreLib()
  #ifdef CORE_LIBRARY_PATH
      QString corePath = CORE_LIBRARY_PATH;
  #else
@@ -44,7 +44,7 @@
  #endif
      m64p_error res = osal_dynlib_open(&coreLib, QDir(corePath).filePath(OSAL_DEFAULT_DYNLIB_FILENAME).toUtf8().constData());
  
-@@ -1046,7 +1047,7 @@ void MainWindow::loadPlugins()
+@@ -1043,7 +1044,7 @@ void MainWindow::loadPlugins()
  #ifdef PLUGIN_DIR_PATH
      QString pluginPath = PLUGIN_DIR_PATH;
  #else
diff --git a/PKGBUILD b/PKGBUILD
index c6bda9d96b44..80d4c2c99b06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p
-pkgver=20220701
+pkgver=20220706
 pkgrel=1
-pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI'
+pkgdesc='Mupen64Plus with custom plugins and Qt6 GUI'
 arch=('x86_64')
 url='https://m64p.github.io/'
 license=('GPL3')
@@ -15,8 +15,8 @@ optdepends=('p7zip: for 7z/zip and VRU support'
 makedepends=('git' 'cmake' 'nasm' 'python' 'zip' 'icoutils' 'vosk-api')
 provides=('mupen64plus-gui')
 conflicts=('mupen64plus-gui' 'mupen64plus')
-_tag="v$(sed -E 's/^([0-9]{4})([0-9]{2})([0-9])([0-9])/\1.\2.\4/' <<< "$pkgver")"
-source=("git+https://github.com/loganmc10/m64p.git#tag=${_tag}"
+#_tag="v$(sed -E 's/^([0-9]{4})([0-9]{2})([0-9])([0-9])/\1.\2.\4/' <<< "$pkgver")"
+source=("git+https://github.com/loganmc10/m64p.git#tag=v2022.07.3"
         '010-m64p-remove-build-jobs-limitation.patch'
         '020-m64p-change-optimizations.patch'
         '030-m64p-remove-bundled-discord-and-vosk.patch'
@@ -29,7 +29,7 @@ sha256sums=('SKIP'
             'cc19027b19c0b516280e5e939115483ded9c7f03b1ff5f91e589e0d6bae9f735'
             'e9da860ae7adcdd0a1cc0155c232f81ca8399e9e855bd71fb51269edb708b1cc'
             '4212cff6311f12ea2af5479a162a183d489dbb4107955c621a4440276a46cb76'
-            '1a03b73ff9b447c717d59115a33e63ad49c0256eb9992ef541b4a3c5e31765c5'
+            '9768f722425649d4125be53da1a9a5fe1206419fee751ba74d7a06fd04c7c57e'
             'a33a66612343035929eee5d6eb2acb342cc0c5a18a8e113aef83b28fb0f156c7'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
 
@@ -44,9 +44,13 @@ prepare() {
     rm -rf m64p/mupen64plus-{gui/discord,input-qt/vosk}
 }
 
+pkgver() {
+    local _tag
+    _tag="$(git -C m64p describe --tags --abbrev='0')"
+    printf '%s' "$(git -C m64p log -1 --format='%ad' --date='format:%Y%m%d' "$_tag")"
+}
+
 build() {
-    export CFLAGS+=' -Wno-unused-function  -Wno-unused-variable'
-    
     cd m64p
     ./build.sh
 }