diff --git a/build-aarch64.sh b/build-aarch64.sh index e5aa865..a2a8e0f 100755 --- a/build-aarch64.sh +++ b/build-aarch64.sh @@ -3,7 +3,7 @@ # this script is intended to be run on debian 13 aarch64 -VERSION="5.16.1" +VERSION="5.16.0" SDL_VERSION="2.32.10" BOLD="\x1b[1m" @@ -11,8 +11,6 @@ RED="\x1b[31m" GREEN="\x1b[32m" RESET="\x1b[0m" -SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" - # make sure we are root if [ "$(id -u)" != "0" ]; then echo -e "${BOLD}${RED}This script must be run as root!${RESET}" @@ -64,9 +62,26 @@ unzip sdl2.zip mv SDL2-${SDL_VERSION} sdl2 rm sdl2.zip -# apply external patch files -patch luanti/src/client/game.cpp "$SCRIPT_DIR"/patches/patch-1.patch -patch luanti/builtin/settingtypes.txt "$SCRIPT_DIR"/patches/patch-2.patch +# create patch files +cat > patch-1.patch <<'EOF' +3753c3753 +< m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.16f, 2.0f); +--- +> m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.001f, 2.0f); +EOF + +cat > patch-2.patch <<'EOF' +151c151 +< repeat_place_time (Place repetition interval) float 0.25 0.16 2.0 +--- +> repeat_place_time (Place repetition interval) float 0.25 0.001 2.0 +EOF + +# apply patches +patch luanti/src/client/game.cpp patch-1.patch +patch luanti/builtin/settingtypes.txt patch-2.patch + +rm patch-[1-2].patch # compile luajit echo -e "${BOLD}Compiling LuaJIT...${RESET}" diff --git a/build-win64.sh b/build-win64.sh index 7e80d4f..2270799 100755 --- a/build-win64.sh +++ b/build-win64.sh @@ -1,14 +1,12 @@ #!/bin/bash # this script is intended to be run in MSYS2 CLANG64 -VERSION="5.16.1" +VERSION="5.16.0" BOLD="\x1b[1m" GREEN="\x1b[32m" RESET="\x1b[0m" -SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" - # system update (skip this most of the time) echo -e "${BOLD}Updating system...${RESET}" pacman -Syu @@ -26,9 +24,25 @@ tar -xf luanti.tar cd luanti-${VERSION}/ -# apply external patch files -patch src/client/game.cpp "${SCRIPT_DIR}/patches/patch-1.patch" -patch builtin/settingtypes.txt "${SCRIPT_DIR}/patches/patch-2.patch" +# create and apply patches +cat > patch-1.patch <<'EOF' +3753c3753 +< m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.16f, 2.0f); +--- +> m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.001f, 2.0f); +EOF + +cat > patch-2.patch <<'EOF' +151c151 +< repeat_place_time (Place repetition interval) float 0.25 0.16 2.0 +--- +> repeat_place_time (Place repetition interval) float 0.25 0.001 2.0 +EOF + +patch src/client/game.cpp patch-1.patch +patch builtin/settingtypes.txt patch-2.patch + +rm patch-[1-2].patch # configure echo -e "${BOLD}Preparing to compile...${RESET}" diff --git a/build-x86_64.sh b/build-x86_64.sh index 5111e3f..285052d 100755 --- a/build-x86_64.sh +++ b/build-x86_64.sh @@ -3,7 +3,7 @@ # this script is intended to be run on debian 13 x86_64 -VERSION="5.16.1" +VERSION="5.16.0" SDL_VERSION="2.32.10" BOLD="\x1b[1m" @@ -11,8 +11,6 @@ RED="\x1b[31m" GREEN="\x1b[32m" RESET="\x1b[0m" -SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" - # make sure we are root if [ "$(id -u)" != "0" ]; then echo -e "${BOLD}${RED}This script must be run as root!${RESET}" @@ -64,9 +62,26 @@ unzip sdl2.zip mv SDL2-${SDL_VERSION} sdl2 rm sdl2.zip -# apply external patch files -patch luanti/src/client/game.cpp "${SCRIPT_DIR}/patches/patch-1.patch" -patch luanti/builtin/settingtypes.txt "${SCRIPT_DIR}/patches/patch-2.patch" +# create patch files +cat > patch-1.patch <<'EOF' +3753c3753 +< m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.16f, 2.0f); +--- +> m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.001f, 2.0f); +EOF + +cat > patch-2.patch <<'EOF' +151c151 +< repeat_place_time (Place repetition interval) float 0.25 0.16 2.0 +--- +> repeat_place_time (Place repetition interval) float 0.25 0.001 2.0 +EOF + +# apply patches +patch luanti/src/client/game.cpp patch-1.patch +patch luanti/builtin/settingtypes.txt patch-2.patch + +rm patch-[1-2].patch # compile luajit echo -e "${BOLD}Compiling LuaJIT...${RESET}" diff --git a/patches/patch-1.patch b/patches/patch-1.patch deleted file mode 100644 index 59ca4db..0000000 --- a/patches/patch-1.patch +++ /dev/null @@ -1,4 +0,0 @@ -3753c3753 -< m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.16f, 2.0f); ---- -> m_repeat_place_time = g_settings->getFloat("repeat_place_time", 0.001f, 2.0f); diff --git a/patches/patch-2.patch b/patches/patch-2.patch deleted file mode 100644 index 673bc5a..0000000 --- a/patches/patch-2.patch +++ /dev/null @@ -1,4 +0,0 @@ -151c151 -< repeat_place_time (Place repetition interval) float 0.25 0.16 2.0 ---- -> repeat_place_time (Place repetition interval) float 0.25 0.001 2.0