From c0c91ca1ffa636f7a7127caed5ef218c28f42100 Mon Sep 17 00:00:00 2001 From: mason Date: Thu, 25 May 2023 14:15:37 +0000 Subject: [PATCH] Clean up Citra-SA --- .../standalone/citra-sa-vulkan/package.mk | 40 ------------------- .../citra-sa-vulkan/patches/000-fix-sdl.patch | 13 ------ .../emulators/standalone/citra-sa/package.mk | 8 ++-- .../citra-sa/scripts/start_citra.sh | 9 ++--- .../config/common/es_features.cfg | 4 +- 5 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 packages/emulators/standalone/citra-sa-vulkan/package.mk delete mode 100644 packages/emulators/standalone/citra-sa-vulkan/patches/000-fix-sdl.patch diff --git a/packages/emulators/standalone/citra-sa-vulkan/package.mk b/packages/emulators/standalone/citra-sa-vulkan/package.mk deleted file mode 100644 index aa8fc98e3..000000000 --- a/packages/emulators/standalone/citra-sa-vulkan/package.mk +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) - -PKG_NAME="citra-sa-vulkan" -PKG_VERSION="1d65b568190f68fae97fd39f56247b12429a6cb5" -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 boost zstd" -PKG_LONGDESC="Citra 3DS emulator" -PKG_TOOLCHAIN="cmake" -GET_HANDLER_SUPPORT="git" -PKG_GIT_CLONE_BRANCH="vulkan-but-better" -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/emulators/standalone/citra-sa-vulkan/patches/000-fix-sdl.patch b/packages/emulators/standalone/citra-sa-vulkan/patches/000-fix-sdl.patch deleted file mode 100644 index 96ffbe8ad..000000000 --- a/packages/emulators/standalone/citra-sa-vulkan/patches/000-fix-sdl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/citra/emu_window/emu_window_sdl2_vk.cpp b/src/citra/emu_window/emu_window_sdl2_vk.cpp -index d6c103955..9402fd9f0 100644 ---- a/src/citra/emu_window/emu_window_sdl2_vk.cpp -+++ b/src/citra/emu_window/emu_window_sdl2_vk.cpp -@@ -24,7 +24,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(bool fullscreen, bool is_secondary) - SDL_WINDOWPOS_UNDEFINED, // x position - SDL_WINDOWPOS_UNDEFINED, // y position - Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight, -- SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); -+ SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); - SDL_SysWMinfo wm; - SDL_VERSION(&wm.version); - if (SDL_GetWindowWMInfo(render_window, &wm) == SDL_FALSE) { diff --git a/packages/emulators/standalone/citra-sa/package.mk b/packages/emulators/standalone/citra-sa/package.mk index 4eac70311..f96c69f2f 100644 --- a/packages/emulators/standalone/citra-sa/package.mk +++ b/packages/emulators/standalone/citra-sa/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="citra-sa" -PKG_VERSION="7677ace5ea9a23138a2359fee43f560c38dd7b8e" +PKG_VERSION="e8bfb9991add79d2f47810f8d9a8f3a03318f038" PKG_LICENSE="MPLv2" -PKG_SITE="https://github.com/citra-emu/citra" +PKG_SITE="https://github.com/citra-emu/citra-canary" PKG_URL="${PKG_SITE}.git" PKG_DEPENDS_TARGET="toolchain ffmpeg mesa SDL2 boost zlib libusb boost zstd" PKG_LONGDESC="Citra 3DS emulator" @@ -22,7 +22,7 @@ fi if [ "${VULKAN_SUPPORT}" = "yes" ] then - PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers citra-sa-vulkan" + PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers" 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-gl + cp ${PKG_BUILD}/.${TARGET_NAME}/bin/MinSizeRel/citra ${INSTALL}/usr/bin/citra cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin chmod +x ${INSTALL}/usr/bin/start_citra.sh diff --git a/packages/emulators/standalone/citra-sa/scripts/start_citra.sh b/packages/emulators/standalone/citra-sa/scripts/start_citra.sh index bce75c1a2..4ee4444f9 100644 --- a/packages/emulators/standalone/citra-sa/scripts/start_citra.sh +++ b/packages/emulators/standalone/citra-sa/scripts/start_citra.sh @@ -125,16 +125,13 @@ ln -sf /storage/roms/3ds/citrasa/nand /storage/.config/citra-emu/nand #Video Backend if [ "$RENDERER" = "1" ] then - cp -r /usr/bin/citra-vulkan /storage/.config/citra-emu/citra - sed -i '/graphics_api =/c\graphics_api = 2' /storage/.config/citra-emu/sdl2-config.ini + sed -i '/graphics_api =/c\graphics_api = 1' /storage/.config/citra-emu/sdl2-config.ini else - cp -r /usr/bin/citra-gl /storage/.config/citra-emu/citra - sed -i '/graphics_api =/c\graphics_api = 1' /storage/.config/citra-emu/sdl2-config.ini + sed -i '/graphics_api =/c\graphics_api = 2' /storage/.config/citra-emu/sdl2-config.ini 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 #Run Citra Emulator - /storage/.config/citra-emu/citra "${1}" + /usr/bin/citra "${1}" diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg index d94fcf4d4..3d0dc1d95 100644 --- a/packages/ui/emulationstation/config/common/es_features.cfg +++ b/packages/ui/emulationstation/config/common/es_features.cfg @@ -282,8 +282,8 @@ - - + +