Match upstream changes. General improvements.

Upstream no longer uses git submodules and have reseted the
commit count.

3 files changed, 19 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41d08eaf315f..92bcdf5ad12f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p-git
 	pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI (git version)
-	pkgver = r140.g19fd445
+	pkgver = 20200604.r0.gbc57b4a
 	pkgrel = 1
 	url = https://m64p.github.io/
 	arch = x86_64
@@ -31,26 +31,12 @@ pkgbase = m64p-git
 	conflicts = mupen64plus-video-gliden64
 	conflicts = mupen64plus
 	source = git+https://github.com/loganmc10/m64p.git
-	source = git+https://github.com/m64p/mupen64plus-gui.git
-	source = git+https://github.com/m64p/mupen64plus-audio-sdl2.git
-	source = git+https://github.com/mupen64plus/mupen64plus-rsp-hle.git
-	source = git+https://github.com/m64p/mupen64plus-input-qt.git
-	source = GLideN64-loganmc10::git+https://github.com/loganmc10/GLideN64.git
-	source = mupen64plus-core-loganmc10::git+https://github.com/loganmc10/mupen64plus-core.git
-	source = mupen64plus-input-raphnetraw-loganmc10::git+https://github.com/loganmc10/mupen64plus-input-raphnetraw.git
 	source = 010-m64p-git-remove-build-jobs-limitation.patch
 	source = 020-m64p-git-enable-optimizations.patch
 	source = m64p.desktop
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = 9241207664cd3338ae38d02f30f7ae0f3e06c3593a50548d46bca6505181b5c2
-	sha256sums = bfd5ba0be1090bdf3460ff9e3794f79e88320e4417359f06380f7c48da241985
+	sha256sums = f4cdfe23cbf35724388e8b7d2ab7f8b93cad461759588deebf46b7eb8fd2367e
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
 
 pkgname = m64p-git
diff --git a/020-m64p-git-enable-optimizations.patch b/020-m64p-git-enable-optimizations.patch
index 9069af83aff5..028862acfba3 100644
--- a/020-m64p-git-enable-optimizations.patch
+++ b/020-m64p-git-enable-optimizations.patch
@@ -5,7 +5,7 @@
  
  cd $base_dir/mupen64plus-core/projects/unix
 -make NETPLAY=1 OSD=0 NO_ASM=1 all
-+make NETPLAY=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
  
@@ -14,10 +14,10 @@
  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" -DMUPENPLUSAPI=On ../../src/
++  cmake -G "MSYS Makefiles" -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
  else
 -  cmake -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
-+  cmake -DMUPENPLUSAPI=On ../../src/
++  cmake -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
  fi
  make
  
diff --git a/PKGBUILD b/PKGBUILD
index 5c0e9b19e3a5..292fbf778cef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p-git
-pkgver=r140.g19fd445
+pkgver=20200604.r0.gbc57b4a
 pkgrel=1
 pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI (git version)'
 arch=('x86_64')
@@ -14,45 +14,30 @@ makedepends=('git' 'cmake' 'nasm' 'icoutils')
 provides=('m64p' 'mupen64plus-gui' 'mupen64plus-video-gliden64')
 conflicts=('m64p' 'mupen64plus-gui' 'mupen64plus-video-gliden64' 'mupen64plus')
 source=('git+https://github.com/loganmc10/m64p.git'
-        'git+https://github.com/m64p/mupen64plus-gui.git'
-        'git+https://github.com/m64p/mupen64plus-audio-sdl2.git'
-        'git+https://github.com/mupen64plus/mupen64plus-rsp-hle.git'
-        'git+https://github.com/m64p/mupen64plus-input-qt.git'
-        'GLideN64-loganmc10'::'git+https://github.com/loganmc10/GLideN64.git'
-        'mupen64plus-core-loganmc10'::'git+https://github.com/loganmc10/mupen64plus-core.git'
-        'mupen64plus-input-raphnetraw-loganmc10'::'git+https://github.com/loganmc10/mupen64plus-input-raphnetraw.git'
         '010-m64p-git-remove-build-jobs-limitation.patch'
         '020-m64p-git-enable-optimizations.patch'
         'm64p.desktop')
 sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
             '9241207664cd3338ae38d02f30f7ae0f3e06c3593a50548d46bca6505181b5c2'
-            'bfd5ba0be1090bdf3460ff9e3794f79e88320e4417359f06380f7c48da241985'
+            'f4cdfe23cbf35724388e8b7d2ab7f8b93cad461759588deebf46b7eb8fd2367e'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
 
 prepare() {
-    git -C m64p submodule init
-    git -C m64p config --local submodule.mupen64plus-core.url "${srcdir}/mupen64plus-core-loganmc10"
-    git -C m64p config --local submodule.GLideN64.url         "${srcdir}/GLideN64-loganmc10"
-    git -C m64p config --local submodule.mupen64plus-gui.url  "${srcdir}/mupen64plus-gui"
-    git -C m64p config --local submodule.mupen64plus-audio-sdl2.url "${srcdir}/mupen64plus-audio-sdl2"
-    git -C m64p config --local submodule.mupen64plus-rsp-hle.url    "${srcdir}/mupen64plus-rsp-hle"
-    git -C m64p config --local submodule.mupen64plus-input-qt.url   "${srcdir}/mupen64plus-input-qt"
-    git -C m64p config --local submodule.mupen64plus-input-raphnetraw.url "${srcdir}/mupen64plus-input-raphnetraw-loganmc10"
-    git -C m64p submodule update
-    icotool -x mupen64plus-gui/mupen64plus.ico
+    icotool -x m64p/mupen64plus-gui/mupen64plus.ico -o m64p/mupen64plus-gui
     patch -d m64p -Np1 -i "${srcdir}/010-m64p-git-remove-build-jobs-limitation.patch"
     patch -d m64p -Np1 -i "${srcdir}/020-m64p-git-enable-optimizations.patch"
 }
 
 pkgver() {
-    printf 'r%s.g%s' "$(git -C m64p rev-list --count HEAD)" "$(git -C m64p rev-parse --short HEAD)"
+    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"
 }
 
 build() {
@@ -70,14 +55,14 @@ package() {
     do
         _res="$(printf '%s' "$_file" | sed 's/\.png$//;s/^.*_//;s/x.*$//')"
         install -D -m644 "$_file" "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/apps/mupen64plus.png"
-    done < <(find -maxdepth 1 -type f -name 'mupen64plus_*_*x*x*.png' -print0)
+    done < <(find m64p/mupen64plus-gui -maxdepth 1 -type f -name 'mupen64plus_*_*x*x*.png' -print0)
     
     # mupen64plus components
     local _component
     local _sover
     for _component in core audio-sdl2 input-raphnetraw rsp-hle
     do
-        make -C "m64p/mupen64plus-${_component}/projects/unix" DESTDIR="$pkgdir" PREFIX='/usr' LDCONFIG='true' install
+        make -C "m64p/mupen64plus-${_component}/projects/unix" DESTDIR="$pkgdir" PREFIX='/usr' LDCONFIG='true' 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"