1 files changed, 18 insertions, 20 deletions
diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD
index 6b646a466..60c2fbf93 100644
--- a/pcr/reicast-git/PKGBUILD
+++ b/pcr/reicast-git/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=reicast
 pkgname=${_pkgname}-git
-pkgver=r1695.0a1689c
+pkgver=r1703.a5b7011
 pkgrel=1
 pkgdesc="A multiplatform Sega Dreamcast emulator"
 arch=('i686' 'x86_64' 'armv7h')
@@ -15,35 +15,29 @@ conflicts=("${_pkgname}")
 makedepends=('git')
 depends=('libgl' 'alsa-plugins' 'libpulse' 'python-evdev') # 'sdl2')
 source=(${_pkgname}-${pkgver}::"git+https://github.com/${_pkgname}/${_pkgname}-emulator.git"
-        'enable_multiplayer_support.patch'
         'fix-dyna-constprop.patch'
         'futuristic-memops.patch'
         'generalize-mappings.patch'
         'loop-tracing.patch'
         'loungekatt_rm-nonfree-fp.patch'
-        'multiplayer.patch'
-        'multiplayer-unstable.patch'
         'refactor-rend-stuff.patch'
         'sdl-opengl.patch'
         'sh-block-graphs.patch'
-        'multiplayer_new.patch'
         'fix-android-translations.patch'
-        'purupuru.patch')
+        'purupuru.patch'
+        'multiplayer-config.patch')
 sha256sums=('SKIP'
-            '12bfc58e12b3ee79b0c82159cdc70c76a4b6804f5c6986853156602bb0e6beb0'
             'c14287cf2b2289b9de28cedeee06fcb89ca40da50e34607780dce55d7d8e5fd6'
             'ce3fe9f10555c473cafbf4e85724ebe7a8535a1fa3bfae3c9bc0fe518024f71e'
             '4c0227db07dc9fa4713694bc438345261e401e0b10c89b25a3c1d20ac9acd9b9'
             'af47982ca67babb18a96014643c2394b45316f474c3b07b4e38079f780606fce'
             '4a6025daded179e88174057affadbcfd539d919c35c36945aa3273fab0b0cb49'
-            '09097f59200daaa919fee6f50473f4295a7de6702f40ad5e2648d12c9478a080'
-            '7c0e2a158d7d37ddbf99a40d11a0a889e55c1e85f9c17a2602e5a2bc809ff4ac'
             'aead8326ac6815b555be03030ffbdc8f6ced625c980e77eca89e570591c5eb34'
             'cf386ebaeafce046a1fc971a5b140bb6a1245840ad2c2a341541327ed6f5606c'
             '94694d1b615facb39b5ee92ed90c6cefc77fab23fb97f2fcc82e0aa6e1cb14c5'
-            '51681ec7f90d3b23f57e2946097798266b709570f5c8567a5742873cb14bda64'
             'a651fd92d1bfbef0a1ca524c54b2a59a8a45c53ef76a1fe53d36d87abef93a85'
-            '02b01a8b1a33aa543213371ec6022559c1eebbeb2d6a20173995ee618d7396a1')
+            '02b01a8b1a33aa543213371ec6022559c1eebbeb2d6a20173995ee618d7396a1'
+            '9ad37cfed1de29a754388f8655dd58d98a3459d5f65475c8d000d92cabb96e43')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -53,13 +47,17 @@ pkgver() {
 prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
+  # Fix GCC 6.1 errors
+  sed -i 's|g++|g++ -std=gnu++98|
+         ' shell/linux/Makefile
+#  sed -i 's|[#]include[ ][<]stdint[.]h[>]|#include <stdint.h>\n#include <iostream>|
+#         ' core/deps/libelf/elf32.cpp
+#  sed -i 's|||
+#         ' core/linux-dist/evdev.cpp
+
   # Remove nonfree fp.h header
   rm -v core/deps/libpng/fp.h
 
-  # Add Multiplayer support
-  patch -Np1 -i "$srcdir"/enable_multiplayer_support.patch
-#  patch -Np1 -i "$srcdir"/multiplayer_new.patch
-
   # Add extra patches
   patch -Np1 -i "$srcdir"/fix-dyna-constprop.patch
   patch -Np1 -i "$srcdir"/futuristic-memops.patch
@@ -71,9 +69,12 @@ prepare() {
   patch -Np1 -i "$srcdir"/sh-block-graphs.patch
   patch -Np1 -i "$srcdir"/fix-android-translations.patch
 
-  # Enable Purupuru Pack (rumble support)
+  # Enable PurupuruPack support (rumble)
   patch -Np1 -i "$srcdir"/purupuru.patch
 
+  # Enable Multiplayer config support
+  patch -Np1 -i "$srcdir"/multiplayer-config.patch
+
   # Add experimental shadow support: http://github.com/reicast-emulator/issues/94
   sed -i 's|//DrawModVols|DrawModVols|' core/rend/gles/gldraw.cpp
 
@@ -96,10 +97,7 @@ build() {
     # Enable Purupuru Pack (rumble support)
     sed -i 's|SegaVMU[,]i[,]1|PurupuruPack,i,1|' ${_pkgname}-${pkgver}/core/hw/maple/maple_cfg.cpp
     make -C ${_pkgname}-${pkgver}/shell/linux platform=x64 PREFIX=/usr DESTDIR="$srcdir"/purupuru-dir install
-    # Error in platform=lincpp:
-    # ../../core/linux-dist/evdev.cpp:287:65:   required from here
-    # /usr/include/c++/5.2.0/tuple:1172:70: error: use of deleted function 'EvdevControllerMapping::EvdevControllerMapping()'
-    #          second(std::forward<_Args2>(std::get<_Indexes2>(__tuple2))...)
+    # Disabled, due is unsupported code with gnu++11 or gnu++98
     # mkdir -vm 0755 "$srcdir"/pkgbuild-cpp-dir
     # make -C ${_pkgname}-${pkgver}/shell/linux platform=lincpp PREFIX=/usr DESTDIR="$srcdir"/pkgbuild-cpp-dir install
   elif [ $CARCH == i686 ]; then