commented the device name checks, RG552 does not support opengl past 3.3 and gliden requires 4.1 min. rk3588 might. Also, gptko hotkey test

2022-12-12 21:26:30 -05:00 · 2022-12-12 21:26:30 -05:00 · dcec80c0bb
commit dcec80c0bb
parent b2ee37d1c0
11 changed files with 118 additions and 101 deletions
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk
@ -18,25 +18,25 @@ if [ ! "${OPENGL}" = "no" ]; then
 fi

 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  if [ "${DEVICE}" = "RG552" ]
-  then
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-  else
-    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
-  fi
+  # if [ "${DEVICE}" = "RG552" ]
+  # then
+  #   PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+  # else
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
+  # fi
 fi

 make_target() {
  case ${ARCH} in
    arm|aarch64)
      export HOST_CPU=aarch64
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
    ;;
  esac
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh
@ -57,7 +57,10 @@ SET_PARAMS="--set Core[SharedDataPath]=$TMP --set Video-Rice[ResolutionWidth]=$S

 # Native Res Factor (Upscaling)
 	if [ "{$CORE}" = "m64p_gliden64" ]; then
-		sed -i "/UseNativeResolutionFactor/c\UseNativeResolutionFactor = $IRES" /tmp/mupen64plussa/mupen64plus.cfg
+		if [ "$IRES" = 0 ]; then
+			sed -i "/UseNativeResolutionFactor/c\UseNativeResolutionFactor = 1" /tmp/mupen64plussa/mupen64plus.cfg
+		else
+			sed -i "/UseNativeResolutionFactor/c\UseNativeResolutionFactor = $IRES" /tmp/mupen64plussa/mupen64plus.cfg
 	fi

 # Input Config
@ -91,6 +94,8 @@ fi

 echo ${SET_PARAMS}

+gptokeyb -c /usr/local/share/mupen64plus/m64psa.gptk -k mupen64plus &
+
 case $1 in
 	"m64p_gliden64")
 		/usr/local/bin/mupen64plus --configdir $TMP --gfx mupen64plus-video-GLideN64 $SET_PARAMS "$2"
@ -105,3 +110,5 @@ case $1 in
 		/usr/local/bin/mupen64plus --configdir $TMP --gfx mupen64plus-video-rice $SET_PARAMS "$2"
 	;;
 esac
+
+killall gptokeyb &
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64psa.gptk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64psa.gptk
@ -0,0 +1,4 @@
+r1_hk = f5
+l1_hk = f7
+r2_hk = f
+x_hk = g
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk
@ -17,7 +17,7 @@ if [ ! "${OPENGL}" = "no" ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
 fi

-if [ "${OPENGLES_SUPPORT}" = yes && ! "${DEVICE}" = "RG552" ]; then
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi

@ -28,11 +28,12 @@ make_target() {
      export VC=0
      export CROSS_COMPILE="${TARGET_PREFIX}"
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
-      if [ "${DEVICE}" = "RG552" ]; then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
    ;;
  esac

@ -61,6 +62,11 @@ makeinstall_target() {
    cp ${PKG_DIR}/config/${DEVICE}/* ${INSTALL}/usr/local/share/mupen64plus/
    chmod 644 ${INSTALL}/usr/local/share/mupen64plus/mupen64plus.cfg
  fi
+
+  # Install the gptk bindings
+  cp ${PKG_DIR} m64psa.gptk ${INSTALL}/usr/local/share/mupen64plus
+  chmod 644 ${INSTALL}/usr/local/share/mupen64plus/m64psa.gptk
+
  mkdir -p ${INSTALL}/usr/bin
  cp ${PKG_DIR}/m64p.sh ${INSTALL}/usr/bin
  chmod 755 ${INSTALL}/usr/bin/m64p.sh
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk
@ -18,25 +18,25 @@ if [ ! "${OPENGL}" = "no" ]; then
 fi

 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  if [ "${DEVICE}" = "RG552" ]
-  then
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-  else
-    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
-  fi
+  # if [ "${DEVICE}" = "RG552" ]
+  # then
+  #   PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+  # else
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
+  # fi
 fi

 make_target() {
  case ${ARCH} in
    arm|aarch64)
      export HOST_CPU=aarch64
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
    ;;
  esac
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-cxd4/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-cxd4/package.mk
@ -13,7 +13,7 @@ if [ ! "${OPENGL}" = "no" ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
 fi

-if [ "${OPENGLES_SUPPORT}" = yes && ! "${DEVICE}" = "RG552" ]; then
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi

@ -27,12 +27,12 @@ make_target() {
  case ${ARCH} in
    arm|aarch64)
      export HOST_CPU=aarch64
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
      CPPFLAGS="-DUSE_SSE2NEON"
    ;;
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk
@ -18,25 +18,25 @@ if [ ! "${OPENGL}" = "no" ]; then
 fi

 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  if [ "${DEVICE}" = "RG552" ]
-  then
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-  else
-    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
-  fi
+  # if [ "${DEVICE}" = "RG552" ]
+  # then
+  #   PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+  # else
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
+  # fi
 fi

 make_target() {
  case ${ARCH} in
    arm|aarch64)
      export HOST_CPU=aarch64
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
    ;;
  esac
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk
@ -18,25 +18,25 @@ if [ ! "${OPENGL}" = "no" ]; then
 fi

 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  if [ "${DEVICE}" = "RG552" ]
-  then
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-  else
-    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
-  fi
+  # if [ "${DEVICE}" = "RG552" ]
+  # then
+  #   PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+  # else
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
+  # fi
 fi

 make_target() {
  case ${ARCH} in
    arm|aarch64)
      export HOST_CPU=aarch64
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
    ;;
  esac
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk
@ -18,25 +18,25 @@ if [ ! "${OPENGL}" = "no" ]; then
 fi

 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  if [ "${DEVICE}" = "RG552" ]
-  then
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-  else
-    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
-  fi
+  # if [ "${DEVICE}" = "RG552" ]
+  # then
+  #   PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+  # else
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
+  # fi
 fi

 make_target() {
  case ${ARCH} in
    arm|aarch64)
      export HOST_CPU=aarch64
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
    ;;
  esac
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk
@ -16,7 +16,7 @@ if [ ! "${OPENGL}" = "no" ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
 fi

-if [ "${OPENGLES_SUPPORT}" = yes && ! "${DEVICE}" = "RG552" ]; then
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi

@ -25,14 +25,14 @@ make_target() {
    arm|aarch64)
      export HOST_CPU=aarch64
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-        PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DNEON_OPT=On"
-      else
-        export USE_GLES=1
-        PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DEGL=0n -DNEON_OPT=On"
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      #   PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DNEON_OPT=On"
+      # else
+      export USE_GLES=1
+      PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DEGL=On -DNEON_OPT=On"
+      # fi
    ;;
  esac
  export APIDIR=$(get_build_dir mupen64plussa-core)/.install_pkg/usr/local/include/mupen64plus
--- a/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk
+++ b/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk
@ -18,25 +18,25 @@ if [ ! "${OPENGL}" = "no" ]; then
 fi

 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  if [ "${DEVICE}" = "RG552" ]
-  then
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-  else
-    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-    PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
-  fi
+  # if [ "${DEVICE}" = "RG552" ]
+  # then
+  #   PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+  # else
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_MAKE_OPTS_TARGET+="USE_GLES=1"
+  # fi
 fi

 make_target() {
  case ${ARCH} in
    arm|aarch64)
      export HOST_CPU=aarch64
-      if [ "${DEVICE}" = "RG552" ]
-      then
-        export USE_GLES=0
-      else
-        export USE_GLES=1
-      fi
+      # if [ "${DEVICE}" = "RG552" ]
+      # then
+      #   export USE_GLES=0
+      # else
+      export USE_GLES=1
+      # fi
      BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
    ;;
  esac