reicast-git: add extra patches

1 files changed, 13 insertions, 72 deletions

diff --git a/pcr/reicast-git/PKGBUILD b/pcr/reicast-git/PKGBUILD
index 20edf1fcb..304b738e6 100644
--- a/pcr/reicast-git/PKGBUILD
+++ b/pcr/reicast-git/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=reicast
 pkgname=${_pkgname}-git
 pkgver=r1688.0e4949e
-pkgrel=1
+pkgrel=2
 pkgdesc="A multiplatform Sega Dreamcast emulator"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://${_pkgname}.com/"
@@ -25,7 +25,9 @@ source=(${_pkgname}-${pkgver}::"git+https://github.com/${_pkgname}/${_pkgname}-e
         'multiplayer-unstable.patch'
         'refactor-rend-stuff.patch'
         'sdl-opengl.patch'
-        'sh-block-graphs.patch')
+        'sh-block-graphs.patch'
+        'multiplayer_new.patch'
+        'fix-android-translations.patch')
 sha256sums=('SKIP'
             '12bfc58e12b3ee79b0c82159cdc70c76a4b6804f5c6986853156602bb0e6beb0'
             'c14287cf2b2289b9de28cedeee06fcb89ca40da50e34607780dce55d7d8e5fd6'
@@ -37,7 +39,9 @@ sha256sums=('SKIP'
             '7c0e2a158d7d37ddbf99a40d11a0a889e55c1e85f9c17a2602e5a2bc809ff4ac'
             'aead8326ac6815b555be03030ffbdc8f6ced625c980e77eca89e570591c5eb34'
             'cf386ebaeafce046a1fc971a5b140bb6a1245840ad2c2a341541327ed6f5606c'
-            '94694d1b615facb39b5ee92ed90c6cefc77fab23fb97f2fcc82e0aa6e1cb14c5')
+            '94694d1b615facb39b5ee92ed90c6cefc77fab23fb97f2fcc82e0aa6e1cb14c5'
+            '51681ec7f90d3b23f57e2946097798266b709570f5c8567a5742873cb14bda64'
+            '097362301f82c3e878352b9fb9812baa6840af054b9dc335600c39de5c22130a')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -48,85 +52,22 @@ prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
   # Remove nonfree fp.h header
-  # rm -v core/deps/libpng/fp.h
+  rm -v core/deps/libpng/fp.h
 
   # Add Multiplayer support
-  patch -Np1 -i "$srcdir"/enable_multiplayer_support.patch
+  # 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
 #  patch -Np1 -i "$srcdir"/generalize-mappings.patch
 #  patch -Np1 -i "$srcdir"/loop-tracing.patch # failed build on i686
-  patch -Np1 -i "$srcdir"/loungekatt_rm-nonfree-fp.patch
-  patch -Np1 -i "$srcdir"/refactor-rend-stuff.patch
+#  patch -Np1 -i "$srcdir"/loungekatt_rm-nonfree-fp.patch
+#  patch -Np1 -i "$srcdir"/refactor-rend-stuff.patch
   patch -Np1 -i "$srcdir"/sdl-opengl.patch
   patch -Np1 -i "$srcdir"/sh-block-graphs.patch
-
-  # Add Multiplayer support (unstable)
-  # core/linux-dist/main.cpp
-  # evdev_controllers[port] = { -1, NULL };
-  # evdev_device_id[port] = -1;
-  # maple_controller[port].enabled = true;
-#  patch -Np1 -i "$srcdir"/multiplayer-unstable.patch
-#  sed -i 's|kcode[[]port[]]|maple_controller[port].buttons|g
-#          s|lt[[]port[]]|maple_controller[port].trigger_left|g
-#          s|rt[[]port[]]|maple_controller[port].trigger_right|g
-#          s|joyx[[]port[]]|maple_controller[port].stick_x|g
-#          s|joyy[[]port[]]|maple_controller[port].stick_y|g
-#          s|DC_DPAD_LEFT|DC_BTN_DPAD1_LEFT|g
-#          s|DC_DPAD_RIGHT|DC_BTN_DPAD1_RIGHT|g
-#          s|DC_DPAD_UP|DC_BTN_DPAD1_UP|g
-#          s|DC_DPAD_DOWN|DC_BTN_DPAD1_DOWN|g
-#          s|DC_DPAD2_LEFT|DC_BTN_DPAD2_LEFT|g
-#          s|DC_DPAD2_RIGHT|DC_BTN_DPAD2_RIGHT|g
-#          s|DC_DPAD2_UP|DC_BTN_DPAD2_UP|g
-#          s|DC_DPAD2_DOWN|DC_BTN_DPAD2_DOWN|g
-#          s|const u32 sdl_map_|const DreamcastControllerCodes sdl_map_|
-#          s|const u32[*] sdl_map_|const DreamcastControllerCodes* sdl_map_|
-#          \|extern u16|d
-#          \|extern u32|d
-#          \|extern u8 |d
-#          \|extern s8 |d
-#          \|#define DC_|d
-#          \|u16 kcode|d
-#          \|u8 rt|d
-#          \|u8 lt|d
-#          \|u32 vks|d
-#          \|s8 joy|d
-#          \|int port = 0; port| s|4|MAPLE_NUM_PORTS|
-#          \|enum DreamcastController|,+32 d
-#          s|#include ["]types[.]h["]|#include "types.h"\n#include "hw/maple/maple_controller.h"|
-#         ' core/sdl/sdl.cpp \
-#           core/linux-dist/main.cpp \
-#           core/linux-dist/main.h \
-#           shell/apple/emulator-ios/emulator/EmulatorView.mm
-#  sed -i 's|kcode[[]port[]]|maple_controller[port].buttons|g
-#          s|lt[[]port[]]|maple_controller[port].trigger_left|g
-#          s|rt[[]port[]]|maple_controller[port].trigger_right|g
-#          s|joyx[[]port[]]|maple_controller[port].stick_x|g
-#          s|joyy[[]port[]]|maple_controller[port].stick_y|g
-#          s|DC_DPAD_LEFT|DC_BTN_DPAD1_LEFT|g
-#          s|DC_DPAD_RIGHT|DC_BTN_DPAD1_RIGHT|g
-#          s|DC_DPAD_UP|DC_BTN_DPAD1_UP|g
-#          s|DC_DPAD_DOWN|DC_BTN_DPAD1_DOWN|g
-#          s|DC_DPAD2_LEFT|DC_BTN_DPAD2_LEFT|g
-#          s|DC_DPAD2_RIGHT|DC_BTN_DPAD2_RIGHT|g
-#          s|DC_DPAD2_UP|DC_BTN_DPAD2_UP|g
-#          s|DC_DPAD2_DOWN|DC_BTN_DPAD2_DOWN|g
-#          \|extern u16|d
-#          \|extern u8 |d
-#          \|extern s8 |d
-#          \|#define key_CONT_|d
-#          s|#include ["]glshaders[.]h["]|#include "glshaders.h"\n#include "hw/maple/maple_controller.h"|
-#         ' core/rend/gles/gles.cpp
-#  sed -i 's|x11_keymap[[]53[]] = DC_BTN_X;|x11_keymap[53] = DC_BTN_X;\nx11_keymap[52] = DC_BTN_Y;|
-#         ' core/linux-dist/x11.cpp
-#  sed -i 's|DC_BTN_DPAD_|DC_BTN_DPAD1_|
-#         ' core/hw/maple/maple_controller.h \
-#           core/windows/winmain.cpp \
-#           core/rend/gles/gles.cpp \
-#           shell/apple/emulator-osx/emulator-osx/osx-main.mm
+  patch -Np1 -i "$srcdir"/fix-android-translations.patch
 
   # Add experimental shadow support: http://github.com/reicast-emulator/issues/94
   sed -i 's|//DrawModVols|DrawModVols|' core/rend/gles/gldraw.cpp