From dcec80c0bb0168d2f479d20a248c2205ad7fc00d Mon Sep 17 00:00:00 2001 From: Nicholas Ricciuti Date: Mon, 12 Dec 2022 21:26:30 -0500 Subject: [PATCH] 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 --- .../mupen64plussa-audio-sdl/package.mk | 26 +++++++++---------- .../mupen64plussa/mupen64plussa-core/m64p.sh | 9 ++++++- .../mupen64plussa-core/m64psa.gptk | 4 +++ .../mupen64plussa-core/package.mk | 18 ++++++++----- .../mupen64plussa-input-sdl/package.mk | 26 +++++++++---------- .../mupen64plussa-rsp-cxd4/package.mk | 14 +++++----- .../mupen64plussa-rsp-hle/package.mk | 26 +++++++++---------- .../mupen64plussa-ui-console/package.mk | 26 +++++++++---------- .../mupen64plussa-video-glide64mk2/package.mk | 26 +++++++++---------- .../mupen64plussa-video-gliden64/package.mk | 18 ++++++------- .../mupen64plussa-video-rice/package.mk | 26 +++++++++---------- 11 files changed, 118 insertions(+), 101 deletions(-) create mode 100644 packages/games/emulators/mupen64plussa/mupen64plussa-core/m64psa.gptk diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-audio-sdl/package.mk index 42a6412bf..76b8880c1 100644 --- 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 diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh b/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64p.sh index 728fb9c84..35ec69899 100644 --- 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 & \ No newline at end of file diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64psa.gptk b/packages/games/emulators/mupen64plussa/mupen64plussa-core/m64psa.gptk new file mode 100644 index 000000000..101da061d --- /dev/null +++ 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 \ No newline at end of file diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-core/package.mk index 7019aae2e..3f8a133fb 100644 --- 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 diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-input-sdl/package.mk index f6bf24745..a5248d85e 100644 --- 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 diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-cxd4/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-cxd4/package.mk index 4c4f91007..080eaff68 100644 --- 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" ;; diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-rsp-hle/package.mk index dd662b9c7..031c22e1f 100644 --- 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 diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-ui-console/package.mk index 64e8aab25..a69310d33 100644 --- 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 diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-video-glide64mk2/package.mk index 32afa949c..ededac9f8 100644 --- 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 diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk index b5a9adb4b..b84ecd6c3 100644 --- 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 diff --git a/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk b/packages/games/emulators/mupen64plussa/mupen64plussa-video-rice/package.mk index dba75f6ed..5ff586637 100644 --- 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