From f921a1277532965479237c10809c1b06c6ad69d4 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Wed, 2 Aug 2023 22:56:43 +0000 Subject: [PATCH 1/2] Fix mupen64plus sa on remaining devices. --- .../mupen64plus-sa-audio-sdl/package.mk | 26 ++++++++--------- .../mupen64plus-sa-core/package.mk | 24 +++++++-------- .../mupen64plus-sa-input-sdl/package.mk | 24 +++++++-------- .../mupen64plus-sa-rsp-cxd4/package.mk | 29 ++++++++----------- .../mupen64plus-sa-rsp-hle/package.mk | 24 +++++++-------- .../mupen64plus-sa-ui-console/package.mk | 22 +++++++------- .../package.mk | 24 +++++++-------- .../mupen64plus-sa-video-gliden64/package.mk | 24 +++++++-------- .../mupen64plus-sa-video-rice/package.mk | 24 +++++++-------- 9 files changed, 100 insertions(+), 121 deletions(-) diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk index e08604cd1..681c6699f 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk @@ -14,29 +14,27 @@ PKG_LONGDESC="Mupen64Plus Standalone Audio SDL" PKG_TOOLCHAIN="manual" case ${DEVICE} in - AMD64|RK3588|S922X|RK3399) + AMD64) PKG_DEPENDS_TARGET+=" mupen64plus-sa-simplecore" ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64|RK33*|RK3588) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ V=1 \ VC=0 \ OSD=0 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/package.mk index 343b40629..1dc022cbb 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/package.mk @@ -14,24 +14,22 @@ PKG_SHORTDESC="mupen64plus" PKG_LONGDESC="Mupen64Plus Standalone" PKG_TOOLCHAIN="manual" -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ V=1 \ VC=0 \ OSD=0 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/package.mk index ff98bd5a7..ff49da9f1 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/package.mk @@ -19,24 +19,22 @@ case ${DEVICE} in ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ V=1 \ VC=0 \ OSD=0 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-cxd4/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-cxd4/package.mk index f3b43867a..c794095e8 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-cxd4/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-cxd4/package.mk @@ -20,24 +20,23 @@ case ${DEVICE} in ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ + HLEVIDEO=1 \ V=1 \ VC=0 \ OSD=0 @@ -45,10 +44,6 @@ make_target() { case ${TARGET_ARCH} in x86_64) export SUFFIX="-sse2" - export HLEVIDEO=1 - ;; - *) - export HLEVIDEO=0 ;; esac diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-hle/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-hle/package.mk index 92719cce9..4f209cadd 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-hle/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-hle/package.mk @@ -19,24 +19,22 @@ case ${DEVICE} in ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ V=1 \ VC=0 \ OSD=0 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-ui-console/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-ui-console/package.mk index 19216111e..5f563bf92 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-ui-console/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-ui-console/package.mk @@ -19,20 +19,18 @@ case ${DEVICE} in ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export V=1 \ VC=0 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-glide64mk2/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-glide64mk2/package.mk index 8830846f1..f53b39ba0 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-glide64mk2/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-glide64mk2/package.mk @@ -19,24 +19,22 @@ case ${DEVICE} in ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ V=1 \ VC=0 \ OSD=0 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk index 34e9e543d..19e2ae505 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk @@ -19,24 +19,22 @@ case ${DEVICE} in ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ V=1 \ VC=0 \ OSD=0 diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-rice/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-rice/package.mk index 327c09358..c600d6d82 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-rice/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-rice/package.mk @@ -19,24 +19,22 @@ case ${DEVICE} in ;; esac -if [ "${OPENGL_SUPPORT}" = "yes" ] -then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" -else - PKG_DEPENDS_TARGET+=" ${OPENGLES}" -fi +case ${DEVICE} in + AMD64) + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + export USE_GLES=0 + ;; + *) + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + export USE_GLES=1 + ;; +esac make_target() { - if [ "${OPENGL_SUPPORT}" = "yes" ] - then - export USE_GLES=0 - else - export USE_GLES=1 - fi export HOST_CPU=${TARGET_ARCH} \ - VFP_HARD=1 \ NEW_DYNAREC=1 \ + VFP_HARD=1 \ V=1 \ VC=0 \ OSD=0 From 25ed314505f4f4017d8807807edf010937a58776 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Wed, 2 Aug 2023 22:58:00 +0000 Subject: [PATCH 2/2] Fix audio package oops. --- .../mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk index 681c6699f..93c58ec2d 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk @@ -14,7 +14,7 @@ PKG_LONGDESC="Mupen64Plus Standalone Audio SDL" PKG_TOOLCHAIN="manual" case ${DEVICE} in - AMD64) + AMD64|RK3588|S922X|RK3399) PKG_DEPENDS_TARGET+=" mupen64plus-sa-simplecore" ;; esac