diff --git a/packages/games/emulators/citrasa/citrasa-vulkan/package.mk b/packages/games/emulators/citrasa/citrasa-vulkan/package.mk new file mode 100644 index 000000000..a90e895b2 --- /dev/null +++ b/packages/games/emulators/citrasa/citrasa-vulkan/package.mk @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) + +PKG_NAME="citrasa-vulkan" +PKG_VERSION="030ecaa83c825bf4c91915d629adca2dadb9aaac" +PKG_LICENSE="MPLv2" +PKG_SITE="https://github.com/GPUCode/citra" +PKG_URL="${PKG_SITE}.git" +PKG_DEPENDS_TARGET="toolchain ffmpeg mesa SDL2 boost zlib libusb" +PKG_LONGDESC="Citra 3DS emulator" +PKG_TOOLCHAIN="cmake" +GET_HANDLER_SUPPORT="git" +PKG_PATCH_DIRS+="${DEVICE}" + +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + +if [ "${VULKAN_SUPPORT}" = "yes" ] +then + PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers" +fi + +pre_configure_target() { +PKG_CMAKE_OPTS_TARGET+=" -DENABLE_QT=OFF \ + -DENABLE_QT_TRANSLATION=OFF \ + -DENABLE_SDL2=ON \ + -DUSE_DISCORD_PRESENCE=OFF" + +} + +makeinstall_target() { + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_BUILD}/.${TARGET_NAME}/bin/MinSizeRel/citra ${INSTALL}/usr/bin/citra-vulkan +} diff --git a/packages/games/emulators/citrasa/package.mk b/packages/games/emulators/citrasa/package.mk index 1c416764f..cb0ecdd98 100644 --- a/packages/games/emulators/citrasa/package.mk +++ b/packages/games/emulators/citrasa/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="citrasa" -PKG_VERSION="84e54a52a6402928f0cda4bbce24d930546f9842" +PKG_VERSION="286f750c6c6b70b48e3fb2fb579e5bfafbf51a69" PKG_LICENSE="MPLv2" -PKG_SITE="https://github.com/GPUCode/citra" +PKG_SITE="https://github.com/citra-emu/citra" PKG_URL="${PKG_SITE}.git" PKG_DEPENDS_TARGET="toolchain ffmpeg mesa SDL2 boost zlib libusb" PKG_LONGDESC="Citra 3DS emulator" @@ -22,7 +22,7 @@ fi if [ "${VULKAN_SUPPORT}" = "yes" ] then - PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers" + PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers citrasa-vulkan" fi pre_configure_target() { @@ -35,7 +35,7 @@ PKG_CMAKE_OPTS_TARGET+=" -DENABLE_QT=OFF \ makeinstall_target() { mkdir -p ${INSTALL}/usr/bin - cp ${PKG_BUILD}/.${TARGET_NAME}/bin/MinSizeRel/citra ${INSTALL}/usr/bin/citra + cp ${PKG_BUILD}/.${TARGET_NAME}/bin/MinSizeRel/citra ${INSTALL}/usr/bin/citra-gl cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin chmod +x ${INSTALL}/usr/bin/start_citra.sh diff --git a/packages/games/emulators/citrasa/scripts/start_citra.sh b/packages/games/emulators/citrasa/scripts/start_citra.sh index 27f7351dc..97cf73035 100644 --- a/packages/games/emulators/citrasa/scripts/start_citra.sh +++ b/packages/games/emulators/citrasa/scripts/start_citra.sh @@ -28,6 +28,7 @@ ln -sf /storage/roms/3ds/citrasa/nand /storage/.config/citra-emu/nand #Emulation Station Features GAME=$(echo "${1}"| sed "s#^/.*/##") + RENDERER=$(get_setting graphics_backend 3ds "${GAME}") RES=$(get_setting resolution_scale 3ds "${GAME}") ROTATE=$(get_setting rotate_screen 3ds "${GAME}") SLAYOUT=$(get_setting screen_layout 3ds "${GAME}") @@ -94,9 +95,18 @@ ln -sf /storage/roms/3ds/citrasa/nand /storage/.config/citra-emu/nand sed -i '/custom_layout =/c\custom_layout = 1' /storage/.config/citra-emu/sdl2-config.ini fi + #Video Backend + if [ "$RENDERER" = "1" ] + then + cp -r /usr/bin/citra-vulkan /storage/.config/citra-emu/citra + else + cp -r /usr/bin/citra-gl /storage/.config/citra-emu/citra + fi + chmod +x /storage/.config/citra-emu/citra rm -rf /storage/.local/share/citra-emu ln -sfv /storage/.config/citra-emu /storage/.local/share/citra-emu -/usr/bin/citra "${1}" +#Run Citra Emulator + /storage/.config/citra-emu/citra "${1}" diff --git a/packages/games/emulators/rpcs3sa/package.mk b/packages/games/emulators/rpcs3sa/package.mk index f59583491..d6300a630 100644 --- a/packages/games/emulators/rpcs3sa/package.mk +++ b/packages/games/emulators/rpcs3sa/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="rpcs3sa" -PKG_VERSION="5bb89328d0c8cac8f98a0c149fda72e3d721079f" +PKG_VERSION="a9f399d6cc1e0f61608640e30721d67cb54985e5" PKG_ARCH="x86_64" PKG_LICENSE="GPL-2.0-or-later" PKG_SITE="https://rpcs3.net" diff --git a/packages/games/emulators/yuzusa/package.mk b/packages/games/emulators/yuzusa/package.mk index 9fb812172..95e68dad4 100644 --- a/packages/games/emulators/yuzusa/package.mk +++ b/packages/games/emulators/yuzusa/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="yuzusa" -PKG_VERSION="889bfce4474ffc61c5dca43a81a9d1225ef93544" +PKG_VERSION="8f3e2a1b48a4f83c90a3b8bf10dd1dc661a69958" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/yuzu-emu/yuzu" diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg index b57a11409..1f7ba0966 100644 --- a/packages/ui/emulationstation/config/common/es_features.cfg +++ b/packages/ui/emulationstation/config/common/es_features.cfg @@ -229,6 +229,10 @@ + + + +