Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 6fad10d9ca46 · 2025-05-13T20:49:36.000Z
43846e3 Update README.md 075be41 Update 'Building with Docker' README section 59a43f8 Exclude ARM from GLIBC_COMPAT 8b5ee97 Fix entrypoint in Docker image a403e7e Fix build workflow f813d74 Add missing files for Docker image 35c1af0 Fix Docker image build context path a513ec0 Add missing backslash to Dockerfile c279e63 Update client en_US pot
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -70,15 +70,10 @@ jobs:
     strategy:
       matrix:
         architecture: [x64, arm64]
-        include:
-        - architecture: x64
-          image-tag: latest
-        - architecture: arm64
-          image-tag: arm64
     name: linux-${{ matrix.architecture }}
     runs-on: ubuntu-latest
     container:
-      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.image-tag }}
+      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/dockerimage.yaml b/.github/workflows/dockerimage.yaml
@@ -25,5 +25,5 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         push: true
-        file: ./utils/docker/Dockerfile
+        context: utils/docker
         tags: ghcr.io/multitheftauto/mtasa-blue-build:latest
diff --git a/README.md b/README.md
@@ -4,10 +4,6 @@
 
 [Multi Theft Auto](https://www.multitheftauto.com/) (MTA) is a software project that adds network play functionality to Rockstar North's Grand Theft Auto game series, in which this functionality is not originally found. It is a unique modification that incorporates an extendable network play element into a proprietary commercial single-player PC game.
 
-> **Note**
-> If you're a fork developer, please read this note carefully. We have changed the default build type back to *CUSTOM* in `Shared/sdk/version.h`. If you're developing without the anti-cheat in mind, say in the Debug configuration, this doesn't affect you at all. Now, if you plan to test your custom client with anti-cheat enabled, you should change your build type to `UNTESTED`. If you want to publish a release of your custom client, you must switch to a *fork support* hardened release of `netc.dll`.
-> Please read our [Forks_Full_AC](https://wiki.multitheftauto.com/wiki/Forks_Full_AC) wiki page for more information.
-
 ## Introduction
 
 Multi Theft Auto is based on code injection and hooking techniques whereby the game is manipulated without altering any original files supplied with the game. The software functions as a game engine that installs itself as an extension of the original game, adding core functionality such as networking and GUI rendering while exposing the original game's engine functionality through a scripting language.
@@ -58,13 +54,10 @@ You can build the MTA:SA server on GNU/Linux distributions only for x86, x86_64,
 
 **Build dependencies**
 
-*Please always read the Dockerfiles for up-to-date build dependencies.*
-*Note: ncftp is not required for building the MTA:SA server.*
+*Please always read the utils/docker/Dockerfile for up-to-date build dependencies.*
 
-- git
 - make
 - GNU GCC compiler (version 10 or newer)
-- libncursesw6
 - libncurses-dev
 - libmysqlclient-dev
 
@@ -73,15 +66,17 @@ You can build the MTA:SA server on GNU/Linux distributions only for x86, x86_64,
 **Note:** This script always deletes `Build/` and `Bin/` directories and does a clean build.
 
 ```sh
-$ ./linux-build.sh [--arch=x86|x64|arm|arm64] [--config=debug|release]
+$ ./linux-build.sh [--arch=x86|x64|arm|arm64] [--config=debug|release] [--cores=<n>]
 $ ./linux-install-data.sh  # optional step
 ```
 
 If build architecture `--arch` is not provided, then it's taken from the environment variable `BUILD_ARCHITECTURE` (defaults to: x64).
 
 If build configuration `--config` is not provided, then it's taken from the environment variable `BUILD_CONFIG` (defaults to: release).
 
-If you are trying to **cross-compile** to another architecture, then set `AR`, `CC`, `CXX`, `GCC_PREFIX` environment variables accordingly (see Dockerfile.arm64 for an example).
+If the number of jobs `--cores` is not provided, then the build will default to the amount of CPU cores.
+
+If you are trying to **cross-compile** to another architecture, then set `AR`, `CC`, `CXX`, `GCC_PREFIX` environment variables accordingly (see `utils/docker/Dockerfile` for an example).
 
 **Build instructions: Manual**
 
@@ -103,23 +98,23 @@ If you have problems resolving the required dependencies or want maximum compati
 $ docker pull ghcr.io/multitheftauto/mtasa-blue-build:latest
 ```
 
-| Architecture | Docker image tag |
-| ------------ | ---------------- |
-| x86_64       | latest           |
-| x86          | i386             |
-| arm          | armhf            |
-| arm64        | arm64            |
-
 **Building with Docker**
 
-These examples assume that your current directory is the mtasa-blue checkout directory. You should also know that `/build` is the code directory required by our Docker images inside the container. If the current directory is not a valid git repository, it instead create a (shallow) clone of the mtasa-blue repository. After compiling, you will find the resulting binaries in `./Bin`. To build the unoptimised debug build, add `-e BUILD_CONFIG=debug` to the docker run arguments.
+These examples assume that your current directory is the mtasa-blue checkout directory. You should also know that `/build` is the code directory required by our Docker image inside the container. After compiling, you will find the resulting binaries in `./Bin`. To build the unoptimised debug build, add `--config=debug` to the docker run arguments.
+
+```sh
+# x86_64
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=x64
+
+# x86
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=x86
 
-| Architecture | Build command                                                                          |
-| ------------ | -------------------------------------------------------------------------------------- |
-| x86_64       | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest ``` |
-| x86          | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:i386 ```   |
-| arm          | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:armhf ```  |
-| arm64        | ``` docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:arm64 ```  |
+# arm
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=arm
+
+# arm64
+docker run --rm -v `pwd`:/build ghcr.io/multitheftauto/mtasa-blue-build:latest --arch=arm64
+```
 
 ### Premake FAQ
 
@@ -131,4 +126,4 @@ Execute `win-create-projects.bat`
 
 Unless otherwise specified, all source code hosted on this repository is licensed under the GPLv3 license. See the [LICENSE](./LICENSE) file for more details.
 
-Grand Theft Auto and all related trademarks are © Rockstar North 1997–2024.
+Grand Theft Auto and all related trademarks are © Rockstar North 1997–2025.
diff --git a/premake5.lua b/premake5.lua
@@ -66,7 +66,7 @@ workspace "MTASA"
 	copy = function(p) return "{COPY} %{cfg.buildtarget.abspath} \"%{wks.location}../Bin/"..p.."/\"" end
 
 	if GLIBC_COMPAT then
-		filter { "system:linux" }
+		filter { "system:linux", "platforms:x86 or x64" }
 			includedirs "/compat"
 			linkoptions "-static-libstdc++ -static-libgcc"
 			forceincludes  { "glibc_version.h" }
diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN    dpkg --add-architecture i386  \
         libncurses-dev:armhf libmysqlclient21:armhf zlib1g-dev:armhf libssl-dev:armhf g++-10-aarch64-linux-gnu   \
         libncurses-dev:i386  libmysqlclient21:i386  zlib1g-dev:i386  libssl-dev:i386  g++-10-multilib            \
         libncurses-dev       libmysqlclient21       zlib1g-dev       libssl-dev                                  \
-    && apt-get upgrade -y
+    && apt-get upgrade -y \
     && cd /tmp \
     && apt-get download \
         libmysqlclient-dev:armhf \
@@ -68,4 +68,4 @@ COPY docker-entrypoint.sh  /docker-entrypoint.sh
 
 RUN chmod +x /docker-entrypoint.sh
 
-ENTRYPOINT bash /docker-entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/docker-entrypoint.sh"]
diff --git a/utils/docker/sources.list b/utils/docker/sources.list
@@ -0,0 +1,20 @@
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal main restricted
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal universe
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-updates universe
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal multiverse
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-updates multiverse
+deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
+deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ focal-security main restricted
+deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ focal-security universe
+deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ focal-security multiverse
+
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal main restricted
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-updates main restricted
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal universe
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-updates universe
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal multiverse
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-updates multiverse
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-backports main restricted universe multiverse
+
+deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main
diff --git a/utils/docker/ubuntu-toolchain-r-ubuntu-test.asc b/utils/docker/ubuntu-toolchain-r-ubuntu-test.asc
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Hostname: 
+Version: Hockeypuck 2.2
+
+xsFNBGYzeoEBEADEVzm0fPTo1KfunTjKV5ZP0Mb86Z6izCXSYbeYt/iAaIfK7a8x
+c13I/uAOxzjcuZHD4sQh7/22I74ignCSexoJD3PnytpZtAxNjyj3jkJpIrdFOVd4
+Cmua5tnEI1Av+B21YLlYYftK2wR+Z6hpsz3NyQ8URR1SCX04BOV9AGxcWb7izkV9
+RHu6xR4x8kAjuTObhhqw/ZR73+U9mig785qmrtapQkF/IanYj2OofqUJwosDo8YA
+shi01735JP9s5do4nnsb6w6xcYQ0HlGn3AxR1k4WA2CK/90QybOmVbLz7IOF3Ou3
+cPfoDzSxAiQemge2msJWPaQLSy/HPUivPB2uNPxkcNIHUVwbjgIig0yaN0EOsveg
+o1m6QvS8sm1MEA2ySl+9+q8wdqTnXbSgA3hq/5OoG4rvHD9GUAd6oRxbz/wdOU3J
+7BlAhEMAHgeQ9DyIzRP9lGeU3QnWNA+WFiiDrLljf+6xewe5iyqLxPqvCkFUDPCF
+emp2oIqeWf6l04IMtM4SJz2AnU1EvytprEEvntMvHMXlBBinw1Q5r3ES/QlPfWr4
+o5CUpu2P3GpZtflDe7jvccyJUMDtlqOVv7wBZPMZykjTAPQ16clGdtIqWdQSk3/b
+UA96RSdpM4gMGXFBGLBoAd7CptafRvPjpRnbMxs2jIxicnASfwJALEFgbQARAQAB
+zT9MYXVuY2hwYWQgUFBBIGZvciBQUEEgZm9yIFVidW50dSBUb29sY2hhaW4gVXBs
+b2FkcyAocmVzdHJpY3RlZCnCwY4EEwEKADgWIQTI7JUuKg4fvcUJD2osJ3oKNSFU
+5QUCZjN6gQIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAsJ3oKNSFU5TkT
+EACpFJ+q0xqfAmRF1886cgtVw+ruJTqfsxdj7ms1os3/I5VXLhPMbUg56mtK9Okj
+0Nf9rY5bnDagJobjtS2JgzMbYWXocPJuwK6ZvmMD5tFSsTov19R3SyIT2x3JAy7S
+/LNWqVeZS41RtM8uSu56PhghE7aAP9PigFTI3CUargpx1DQh6xiHKRR57ZMrLcd4
+l6tj8yb4Hl+OeFRQMcoim696lPMSqzVtJ0epP7yNsz2LFaRmkRP/hf+S4JlSs8uC
+wzAl9eJR2h1v1WoBr0pAW2gjjd8VyKWhaKjneicJPqo5GDvhDl+lbrpqSwSHENlH
+DVyC+XvAjvTf4JhTQE/M1L/sGrqqa65n+WF4ZqauiDvn1bUw0vnL0oaiK/hyH1YG
+XW7khJ7JDlw/6LFNZ6Ih0UuVRTzVBBBz3Sipw5hgM9ztKEYLMI5zlwWGlhEjMnxD
+X5WauIUWjPv3dKQp1qTthN7Fgv3/2J6j+2/tMAfWeWB1tL8H4lVPUCfcpQpkTP/E
+HTnB3oaRiYy6GDuGKsNkhEUvlV2AnVAxO17IN5QQ2lMQ261zaPj9y9v1oCQlzGfm
+UKRJWFGbsooapdm7DTrqrfO+zyRXWPe6GRnYlmeXTRWi8CEIXpCkhhf8rma8KNnW
+S96jsTSU97Lo0hnIbL+4o3qf2BiYcfIwfoIXzUaj5ajGEA==
+=CwJW
+-----END PGP PUBLIC KEY BLOCK-----
