Merge pull request #1590 from rishooty/parallelPlusSimpleHack

actual tested arm fix, should work on s922x now

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/package.mk

@@ -25,6 +25,7 @@ make_target() {
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
+      export NEON=1
     ;;
     x86_64)
       export HOST_CPU=x86_64

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/package.mk

@@ -25,25 +25,23 @@ make_target() {
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
-      export USE_GLES=1
+      sed -i 's/x86-64-v3/armv8-a/g' ${PKG_BUILD}/CMakeLists.txt
+      ARM="-DARM=1"
     ;;
     x86_64)
       export HOST_CPU=x86_64
-      export USE_GLES=0
+      ARM=""
     ;;
   esac
   export NEW_DYNAREC=1
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"
   export SDL_LDLIBS="-lSDL2_net -lSDL2"
   export CROSS_COMPILE="${TARGET_PREFIX}"
-  export V=1
-  export VC=0
-  export OSD=0
   cd ${PKG_BUILD}
   rm -rf build
   mkdir build
   cd build
-  cmake -G Ninja -DCMAKE_BUILD_TYPE="${RELEASE_TYPE}" ..
+  cmake -G Ninja ${ARM} -DCMAKE_BUILD_TYPE="Release" ..
   VERBOSE=1 cmake --build .
 }
 

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/patches/002-fix-arm.patch

@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fad5e481..51b275d5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,9 @@ include_directories(
+ )
+ 
+ add_definitions(-DM64P_PARALLEL -DM64P_NETPLAY -DNO_ASM)
++if(ARM)
++    add_definitions(-DUSE_GLES -DV -DNEON)
++endif(ARM)
+ 
+ add_library(mupen64plus SHARED
+     src/api/callbacks.c