Merge pull request #1596 from fewtarius/dev

Dev
2023-06-17 13:03:17 -04:00 · 2023-06-17 13:03:17 -04:00 · bbe8b22178
commit bbe8b22178
parent b2b78e8ee0 7e92a262b8
13 changed files with 29 additions and 16 deletions
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="Mupen64Plus Standalone Audio SDL"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/package.mk
+++ b/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
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh
@ -119,7 +119,7 @@ fi
 	fi

 # SIMPLECORE, decide which executable to use for simple64
-if [ "{$SIMPLECORE}" = "simple" ]; then
+ if [ "${SIMPLECORE}" = "simple" ]; then
 	SIMPLESUFFIX="-simple"
 	SET_PARAMS="$SET_PARAMS --set Core[R4300Emulator]=1"
 else
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="Mupen64Plus Standalone Input SDL"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-cxd4/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-cxd4/package.mk
@ -9,7 +9,7 @@ PKG_LONGDESC="Mupen64Plus Standalone RSP CXD4"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-hle/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-hle/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="Mupen64Plus Standalone RSP HLE"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/package.mk
+++ b/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 .
 }

--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/patches/002-fix-arm.patch
+++ b/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
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-ui-console/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-ui-console/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="Mupen64Plus Standalone Console"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-glide64mk2/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-glide64mk2/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="Mupen64Plus Standalone Glide64 Video Driver"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="Mupen64Plus Standalone GLide64 Video Driver"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-rice/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-rice/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="Mupen64Plus Standalone Rice Video Driver"
 PKG_TOOLCHAIN="manual"

 case ${DEVICE} in
-  AMD64|RK3588)
+  AMD64|RK3588|S922X)
    PKG_DEPENDS_TARGET="mupen64plus-sa-simplecore"
  ;;
 esac
--- a/projects/Amlogic/devices/S922X/options
+++ b/projects/Amlogic/devices/S922X/options
@ -4,7 +4,7 @@

  # The TARGET_CPU variable controls which processor should be targeted for
  # generated code.
-   case $TARGET_ARCH in
+   case ${TARGET_ARCH} in
      aarch64)
        TARGET_KERNEL_ARCH="arm64"
        TARGET_PATCH_ARCH="aarch64"