Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@c50fc3a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7480)
Pufferfish Changes:
pufferfish-gg/Pufferfish@81f546b Fix SIMD when pixel counts aren't divisible by 8