fix(fex): skip local patches already in the FEX release (#2152)

This commit is contained in:
MaxsTechReview authored and GitHub committed 2026-11-05 21:33:57 -05:00
1 parent c8a76e7cce
commit f4e5032b7d
2 files changed
+9 -1

No files matched your search

+8 -1
View File
@@ -36,7 +36,14 @@ CONF
fi
rm -rf fex-src out && git clone -q --depth 1 --branch "$VERSION" --recurse-submodules --shallow-submodules https://github.com/FEX-Emu/FEX.git fex-src
for p in tools/fex/patches/*.patch; do patch -d fex-src -p1 --no-backup-if-mismatch < "$p"; done
for p in tools/fex/patches/*.patch; do
upstream=$(sed -n 's/^Fixed-upstream: FEX-\([0-9]\{4\}\)$/\1/p' "$p")
if [ -n "$upstream" ] && [ "${VERSION#FEX-}" -ge "$upstream" ]; then
echo "$(basename "$p"): already in FEX-$upstream, skipped for $VERSION"
continue
fi
patch -d fex-src -p1 --no-backup-if-mismatch < "$p"
done
if [ "$THUNKS" = 1 ]; then
for t in fex-src/Data/CMake/toolchain_x86_64.cmake fex-src/Data/CMake/toolchain_x86_32.cmake; do
printf '\nif (X86_DEV_ROOTFS AND NOT X86_DEV_ROOTFS STREQUAL "/")\n set(CMAKE_SYSROOT "${X86_DEV_ROOTFS}")\nendif()\n' >> "$t"
@@ -1,3 +1,4 @@
Fixed-upstream: FEX-2611
--- a/ThunkLibs/Generator/gen.cpp
+++ b/ThunkLibs/Generator/gen.cpp
@@ -840,6 +840,5 @@