From 63ff9ab65bebbbe3fbf4ed8759a84c879c8c86ec Mon Sep 17 00:00:00 2001 From: moonpower Date: Tue, 4 Aug 2026 23:07:17 +0200 Subject: [PATCH] Switch fsui submodule to fuse-lib on GitHub --- .gitea/workflows/build.yml | 14 +++++++------- .gitmodules | 6 +++--- Makefile | 2 +- build-uwp-all.ps1 | 2 +- build-uwp-native.sh | 2 +- build-win32.ps1 | 2 +- build-win64.ps1 | 2 +- build.sh | 14 +++++++------- cmake/psvita-fsui/CMakeLists.txt | 2 +- scripts/ci/build-linux-musl-target.sh | 2 +- scripts/ci/build-linux-target.sh | 2 +- scripts/ci/build-windows-cross.sh | 2 +- third_party/fsui-lib | 1 - third_party/fuse-lib | 1 + web/postprocess_web_html.cmake | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) delete mode 160000 third_party/fsui-lib create mode 160000 third_party/fuse-lib diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index c9caabd..b6efab1 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -48,7 +48,7 @@ jobs: set -euo pipefail token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" if [ -z "$token" ]; then - echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 + echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2 exit 1 fi @@ -104,7 +104,7 @@ jobs: set -euo pipefail token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" if [ -z "$token" ]; then - echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 + echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2 exit 1 fi @@ -183,7 +183,7 @@ jobs: set -euo pipefail token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" if [ -z "$token" ]; then - echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 + echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2 exit 1 fi @@ -282,7 +282,7 @@ jobs: set -euo pipefail token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" if [ -z "$token" ]; then - echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 + echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2 exit 1 fi @@ -349,7 +349,7 @@ jobs: set -euo pipefail token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" if [ -z "$token" ]; then - echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 + echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2 exit 1 fi @@ -408,7 +408,7 @@ jobs: set -euo pipefail token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" if [ -z "$token" ]; then - echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 + echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2 exit 1 fi @@ -501,7 +501,7 @@ jobs: set -euo pipefail token="${GIT_TOKEN:-${FSUI_SUBMODULE_TOKEN:-}}" if [ -z "$token" ]; then - echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fsui-lib submodule." >&2 + echo "GIT_TOKEN (or FSUI_SUBMODULE_TOKEN) is required to fetch the private fuse-lib submodule." >&2 exit 1 fi diff --git a/.gitmodules b/.gitmodules index 7b823ab..fe1f907 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "third_party/SDL"] path = third_party/SDL url = https://github.com/libsdl-org/SDL.git -[submodule "third_party/fsui-lib"] - path = third_party/fsui-lib - url = https://git.nanodata.cloud/moonpower/fsui-lib.git [submodule "third_party/libchdr"] path = third_party/libchdr url = https://github.com/rtissera/libchdr.git +[submodule "third_party/fuse-lib"] + path = third_party/fuse-lib + url = https://github.com/momo-AUX1/fuse-lib.git diff --git a/Makefile b/Makefile index 7aaf978..7649703 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ IOS_SDL_FRAMEWORK ?= $(CURDIR)/ios/Frameworks/SDL2.xcframework/ios-arm64/SDL2.fr IOS_SDL_FRAMEWORK_PARENT := $(dir $(IOS_SDL_FRAMEWORK)) SDKROOT ?= CONTROLLER_GENERIC ?= 0 -FSUI_DIR := third_party/fsui-lib +FSUI_DIR := third_party/fuse-lib FSUI_BUILD_DIR ?= build/fsui/native WASM_HTML_POSTPROCESS := web/postprocess_web_html.cmake FSUI_LINK_SYSTEM_GL ?= 1 diff --git a/build-uwp-all.ps1 b/build-uwp-all.ps1 index 5bb5ae8..82f7962 100644 --- a/build-uwp-all.ps1 +++ b/build-uwp-all.ps1 @@ -54,7 +54,7 @@ if (-not $MsBuildCommand) { New-Item -ItemType Directory -Force -Path bin, $UwpOutputDir, $UwpIconsDir | Out-Null -cmake -S third_party/fsui-lib -B $FsuiBuildDir -G "MinGW Makefiles" ` +cmake -S third_party/fuse-lib -B $FsuiBuildDir -G "MinGW Makefiles" ` -DFSUI_BUILD_SAMPLES=OFF ` -DFSUI_PLATFORM_BACKEND=SDL2 ` -DFSUI_USE_SYSTEM_SDL2=ON ` diff --git a/build-uwp-native.sh b/build-uwp-native.sh index 2ee9ed4..547201a 100755 --- a/build-uwp-native.sh +++ b/build-uwp-native.sh @@ -184,7 +184,7 @@ fi mkdir -p "$repo_root/bin" "$uwp_output_dir" "$uwp_icons_dir" -cmake -S "$repo_root/third_party/fsui-lib" -B "$fsui_build_dir" -G "MinGW Makefiles" \ +cmake -S "$repo_root/third_party/fuse-lib" -B "$fsui_build_dir" -G "MinGW Makefiles" \ -DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_USE_SYSTEM_SDL2=ON \ diff --git a/build-win32.ps1 b/build-win32.ps1 index 9809b02..ac6d67c 100644 --- a/build-win32.ps1 +++ b/build-win32.ps1 @@ -20,7 +20,7 @@ if (!(Test-Path $SDL2_ROOT)) { mkdir -Force -Path bin > $null mkdir -Force -Path "bin\icons" > $null -cmake -S third_party/fsui-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" ` +cmake -S third_party/fuse-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" ` -DFSUI_BUILD_SAMPLES=OFF ` -DFSUI_PLATFORM_BACKEND=SDL2 ` -DFSUI_USE_SYSTEM_SDL2=ON ` diff --git a/build-win64.ps1 b/build-win64.ps1 index e947627..769d0fc 100644 --- a/build-win64.ps1 +++ b/build-win64.ps1 @@ -20,7 +20,7 @@ if (!(Test-Path $SDL2_ROOT)) { mkdir -Force -Path bin > $null mkdir -Force -Path "bin\icons" > $null -cmake -S third_party/fsui-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" ` +cmake -S third_party/fuse-lib -B $FSUI_BUILD_DIR -G "MinGW Makefiles" ` -DFSUI_BUILD_SAMPLES=OFF ` -DFSUI_PLATFORM_BACKEND=SDL2 ` -DFSUI_USE_SYSTEM_SDL2=ON ` diff --git a/build.sh b/build.sh index 0d2642e..aa4ef3e 100755 --- a/build.sh +++ b/build.sh @@ -42,13 +42,13 @@ resolve_fsui_python() { build_fsui_native() { if [ "$(uname -s)" = "Darwin" ]; then MACOS_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET:-10.15}" - cmake -S third_party/fsui-lib -B build/fsui/native \ + cmake -S third_party/fuse-lib -B build/fsui/native \ -DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_USE_SYSTEM_SDL2=ON \ -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET}" else - cmake -S third_party/fsui-lib -B build/fsui/native \ + cmake -S third_party/fuse-lib -B build/fsui/native \ -DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_USE_SYSTEM_SDL2=ON @@ -88,7 +88,7 @@ build_fsui_wasm() { exit 1 fi - emcmake cmake -S third_party/fsui-lib -B build/fsui/wasm \ + emcmake cmake -S third_party/fuse-lib -B build/fsui/wasm \ -DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_PLATFORM_BACKEND=SDL2 cmake --build build/fsui/wasm -j"${BUILD_JOBS}" @@ -112,8 +112,8 @@ build_fsui_psvita() { cmake --build build/fsui/psvita -j"${BUILD_JOBS}" # The Vita Rust wrapper expects the FSUI archives in the CMake root output - # directory, so stage the real archives out of the nested fsui-lib build. - cp build/fsui/psvita/fsui-lib/libfsui*.a build/fsui/psvita/ + # directory, so stage the real archives out of the nested fuse-lib build. + cp build/fsui/psvita/fuse-lib/libfsui*.a build/fsui/psvita/ } bundle_macos_app() { @@ -180,7 +180,7 @@ if [ "$MODE" = "ios" ]; then FSUI_PYTHON="$(resolve_fsui_python)" echo "Building iOS dylib with SDK ${IOS_SDK} (${IOS_SDKROOT})" - cmake -S third_party/fsui-lib -B build/fsui/ios \ + cmake -S third_party/fuse-lib -B build/fsui/ios \ -DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_USE_SYSTEM_SDL2=ON \ @@ -334,7 +334,7 @@ elif [ "$MODE" = "android" ]; then FSUI_BUILD_ROOT="${REPO_ROOT}/build/fsui/android/${ANDROID_ABI}" FSUI_PYTHON="$(resolve_fsui_python)" - cmake -S third_party/fsui-lib -B "${FSUI_BUILD_ROOT}" \ + cmake -S third_party/fuse-lib -B "${FSUI_BUILD_ROOT}" \ -DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_PLATFORM_BACKEND=SDL2 \ -DFSUI_USE_SYSTEM_SDL2=ON \ diff --git a/cmake/psvita-fsui/CMakeLists.txt b/cmake/psvita-fsui/CMakeLists.txt index f94bfee..4db4a9a 100644 --- a/cmake/psvita-fsui/CMakeLists.txt +++ b/cmake/psvita-fsui/CMakeLists.txt @@ -51,7 +51,7 @@ set(FSUI_PLATFORM_BACKEND SDL2 CACHE STRING "Platform backend to build" FORCE) set(FSUI_IMGUI_OPENGL_ES3 ON CACHE BOOL "Build the fsui OpenGL backend in OpenGL ES 3 mode" FORCE) set(FSUI_USE_SYSTEM_SDL2 OFF CACHE BOOL "Prefer a system SDL2 package when an SDL target is not already available" FORCE) -add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../third_party/fsui-lib" "${CMAKE_BINARY_DIR}/fsui-lib") +add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../third_party/fuse-lib" "${CMAKE_BINARY_DIR}/fuse-lib") if(DEFINED VITASDK AND VITASDK) # Vita packaging tools reject PIC-style ARM relocations such as R_ARM_BASE_PREL. diff --git a/scripts/ci/build-linux-musl-target.sh b/scripts/ci/build-linux-musl-target.sh index 7572677..f4f7bd5 100755 --- a/scripts/ci/build-linux-musl-target.sh +++ b/scripts/ci/build-linux-musl-target.sh @@ -186,7 +186,7 @@ esac rm -rf "$fsui_build_dir" "$artifact_root" mkdir -p "$artifact_root" -cmake -S "$repo_root/third_party/fsui-lib" -B "$fsui_build_dir" \ +cmake -S "$repo_root/third_party/fuse-lib" -B "$fsui_build_dir" \ -DCMAKE_TOOLCHAIN_FILE="$toolchain_file" \ -DCMAKE_BUILD_TYPE=Release \ -DFSUI_BUILD_SAMPLES=OFF \ diff --git a/scripts/ci/build-linux-target.sh b/scripts/ci/build-linux-target.sh index b4767e0..a455173 100755 --- a/scripts/ci/build-linux-target.sh +++ b/scripts/ci/build-linux-target.sh @@ -17,7 +17,7 @@ package_root="$artifact_root/armsx-linux-$target" package_zip="$artifact_root/armsx-linux-$target.zip" cmake_args=( - -S "$repo_root/third_party/fsui-lib" + -S "$repo_root/third_party/fuse-lib" -B "$fsui_build_dir" -DFSUI_BUILD_SAMPLES=OFF -DFSUI_PLATFORM_BACKEND=SDL2 diff --git a/scripts/ci/build-windows-cross.sh b/scripts/ci/build-windows-cross.sh index b39b646..5ccdbf2 100755 --- a/scripts/ci/build-windows-cross.sh +++ b/scripts/ci/build-windows-cross.sh @@ -56,7 +56,7 @@ if [ -z "$sdl_dll" ]; then exit 1 fi -cmake -S "$repo_root/third_party/fsui-lib" -B "$fsui_build_dir" \ +cmake -S "$repo_root/third_party/fuse-lib" -B "$fsui_build_dir" \ -DCMAKE_TOOLCHAIN_FILE="$toolchain_file" \ -DFSUI_BUILD_SAMPLES=OFF \ -DFSUI_PLATFORM_BACKEND=SDL2 \ diff --git a/third_party/fsui-lib b/third_party/fsui-lib deleted file mode 160000 index 9ced12b..0000000 --- a/third_party/fsui-lib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9ced12b7b98460acd6d84832256f8e34921f6ba6 diff --git a/third_party/fuse-lib b/third_party/fuse-lib new file mode 160000 index 0000000..a830ff1 --- /dev/null +++ b/third_party/fuse-lib @@ -0,0 +1 @@ +Subproject commit a830ff1216d302ffdfda413aad66d2dc77964e8f diff --git a/web/postprocess_web_html.cmake b/web/postprocess_web_html.cmake index 31e128c..8445ab8 100644 --- a/web/postprocess_web_html.cmake +++ b/web/postprocess_web_html.cmake @@ -2,7 +2,7 @@ if(NOT DEFINED INPUT_FILE) message(FATAL_ERROR "postprocess_web_html.cmake requires INPUT_FILE") endif() -include("${CMAKE_CURRENT_LIST_DIR}/../third_party/fsui-lib/cmake/postprocess_web_html.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../third_party/fuse-lib/cmake/postprocess_web_html.cmake") file(READ "${INPUT_FILE}" html) file(READ "${CMAKE_CURRENT_LIST_DIR}/file_access.js" file_access)