Merge branch 'master' into for-0.56.0/sync

Author: VReaperV

CMakeLists.txt

@@ -725,6 +725,18 @@ endif()
 
 # SDL, required for all targets on win32 because of iconv and SDL_SetHint(SDL_TIMER_RESOLUTION, 0)
 if (BUILD_CLIENT OR WIN32)
+    # Use our detected architecture instead of letting SDL do it again
+    # Note that sdlcpu.cmake is only included on a random subset of platforms
+    set(sdlvar_i686 SDL_CPU_X86)
+    set(sdlvar_amd64 SDL_CPU_X64)
+    set(sdlvar_armhf SDL_CPU_ARM32)
+    set(sdlvar_arm64 SDL_CPU_ARM64)
+    if (sdlvar_${ARCH})
+        set(${sdlvar_${ARCH}} 1)
+    else()
+        message("Developer TODO: translate architecture ${ARCH} for SDL")
+    endif()
+
     find_package(SDL3 REQUIRED CONFIG)
 
     if (WIN32)

external_deps/build.sh

@@ -93,38 +93,44 @@ log() {
 # Extract an archive into the given subdirectory of the build dir and cd to it
 # Usage: extract <filename> <directory>
 extract() {
-	rm -rf "${2}"
-	mkdir -p "${2}"
-	case "${1}" in
+	local archive_file="${1}"; shift
+	local extract_dir="${1}"; shift
+
+	local archive_name="$(basename "${archive_file}")"
+	log STATUS "Extracting ${archive_name}"
+
+	rm -rf "${extract_dir}"
+	mkdir -p "${extract_dir}"
+	case "${archive_file}" in
 	*.tar.bz2)
-		tar xjf "${1}" -C "${2}"
+		tar xjf "${archive_file}" -C "${extract_dir}"
 		;;
 	*.tar.xz)
-		tar xJf "${1}" -C "${2}"
+		tar xJf "${archive_file}" -C "${extract_dir}"
 		;;
 	*.tar.gz|*.tgz)
-		tar xzf "${1}" -C "${2}"
+		tar xzf "${archive_file}" -C "${extract_dir}"
 		;;
 	*.zip)
-		unzip -d "${2}" "${1}"
+		unzip -d "${extract_dir}" "${archive_file}"
 		;;
 	*.cygtar.bz2)
 		# Some Windows NaCl SDK packages have incorrect symlinks, so use
 		# cygtar to extract them.
-		"${SCRIPT_DIR}/cygtar.py" -xjf "${1}" -C "${2}"
+		"${SCRIPT_DIR}/cygtar.py" -xjf "${archive_file}" -C "${extract_dir}"
 		;;
 	*.dmg)
 		local dmg_temp_dir="$(mktemp -d)"
-		hdiutil attach -mountpoint "${dmg_temp_dir}" "${1}"
-		cp -R "${dmg_temp_dir}/"* "${2}/"
+		hdiutil attach -mountpoint "${dmg_temp_dir}" "${archive_file}"
+		cp -R "${dmg_temp_dir}/"* "${extract_dir}/"
 		hdiutil detach "${dmg_temp_dir}"
 		rmdir "${dmg_temp_dir}"
 		;;
 	*)
-		log ERROR "Unknown archive type for ${1}"
+		log ERROR "Unknown archive type for ${archive_name}"
 		;;
 	esac
-	cd "${2}"
+	cd "${extract_dir}"
 }
 
 download() {
@@ -1110,7 +1116,7 @@ build_depcheck() {
 		for dll in $(find "${PREFIX}/bin" -type f -name '*.dll'); do
 			# https://wiki.unvanquished.net/wiki/MinGW#Built-in_DLL_dependencies
 			if objdump -p "${dll}" | grep -oP '(?<=DLL Name: )(libgcc_s|libstdc|libssp|libwinpthread).*'; then
-				echo "${dll} depends on above DLLs"
+				log WARNING "${dll} depends on above DLLs"
 				good=false
 			fi
 		done
@@ -1163,14 +1169,20 @@ build_genlib() {
 	esac
 }
 
+build() {
+	for pkg in "${@}"
+	do
+		cd "${WORK_DIR}"
+		log STATUS "Processing target '${pkg}' for ${PLATFORM}"
+		"build_${pkg}"
+	done
+}
+
 list_build() {
 	local list_name="${1}"
 	local package_list
 	eval "package_list=(\${${list_name}_${PLATFORM//-/_}_packages})"
-	for pkg in "${package_list[@]}"; do
-		cd "${WORK_DIR}"
-		"build_${pkg}"
-	done
+	build "${package_list[@]}"
 }
 
 build_base() {
@@ -1454,69 +1466,79 @@ all_linux_arm64_default_packages='zlib gmp nettle curl sdl3 glew png jpeg webp o
 base_linux_armhf_default_packages="${base_linux_arm64_default_packages}"
 all_linux_armhf_default_packages="${all_linux_arm64_default_packages}"
 
-linux_build_platforms='linux-amd64-default linux-arm64-default linux-armhf-default linux-i686-default windows-amd64-mingw windows-amd64-msvc windows-i686-mingw windows-i686-msvc'
-macos_build_platforms='macos-amd64-default'
-all_platforms="$(echo ${linux_build_platforms} ${macos_build_platforms} | tr ' ' '\n' | sort -u | xargs echo)"
+all_linux_platforms='linux-amd64-default linux-arm64-default linux-armhf-default linux-i686-default'
+all_windows_platforms='windows-amd64-mingw windows-amd64-msvc windows-i686-mingw windows-i686-msvc'
+all_macos_platforms='macos-amd64-default'
+all_platforms="${all_linux_platforms} ${all_windows_platforms} ${all_macos_platforms}"
 
-errorHelp() {
-	sed -e 's/\\t/'$'\t''/g' <<-EOF
-	usage: $(basename "${BASH_SOURCE[0]}") [OPTION] <PLATFORM> <PACKAGE[S]...>
+printHelp() {
+	# Please align to 4-space tabs.
+	cat >&2 <<-EOF
+	usage: $(basename "${BASH_SOURCE[0]}") [OPTION] <PLATFORM> <PACKAGE(S)...>
 
 	Script to build dependencies for platforms which do not provide them
 
 	Options:
-	\t--download-only — only download source packages, do not build them
-	\t--prefer-ours — attempt to download from unvanquished.net first
+	    --download-only only download source packages, do not build them
+	    --prefer-ours   attempt to download from unvanquished.net first
 
 	Platforms:
-	\t${all_platforms}
+	    ${all_platforms}
 
 	Virtual platforms:
-	\tall: all platforms
-	\tbuild-linux — platforms buildable on linux: ${linux_build_platforms}
-	\tbuild-macos — platforms buildable on macos: ${macos_build_platforms}
+	    linux   ${all_linux_platforms}
+	    windows ${all_windows_platforms}
+	    macos   ${all_macos_platforms}
+	    all     linux windows macos
 
 	Packages:
-	\tpkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
+	    pkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
 
 	Virtual packages:
-	\tbase — build packages for pre-built binaries to be downloaded when building the game
-	\tall — build all supported packages that can possibly be involved in building the game
-	\tinstall — create a stripped down version of the built packages that CMake can use
-	\tpackage — create a zip/tarball of the dependencies so they can be distributed
-	\twipe — remove products of build process, excepting download cache but INCLUDING installed files. Must be last
+	    base    build packages for pre-built binaries to be downloaded when building the game
+	    all     build all supported packages that can possibly be involved in building the game
+	    install create a stripped down version of the built packages that CMake can use
+	    package create a tarball of the dependencies so they can be distributed
+	    wipe    remove products of build process, excepting download cache but INCLUDING installed files. Must be last
 
 	Packages required for each platform:
 
 	windows-amd64-msvc:
 	windows-i686-msvc:
-	\tbase: ${base_windows_amd64_msvc_packages}
-	\tall: same
+	    base    ${base_windows_amd64_msvc_packages}
+	    all     same
 
 	windows-amd64-mingw:
 	windows-i686-mingw:
-	\tbase: ${base_windows_amd64_mingw_packages}
-	\tall: same
+	    base    ${base_windows_amd64_mingw_packages}
+	    all     same
 
 	macos-amd64-default:
-	\tbase: ${base_macos_amd64_default_packages}
-	\tall: same
+	    base    ${base_macos_amd64_default_packages}
+	    all     same
 
 	linux-amd64-default:
-	\tbase: ${base_linux_amd64_default_packages}
-	\tall: ${all_linux_amd64_default_packages}
+	    base    ${base_linux_amd64_default_packages}
+	    all     ${all_linux_amd64_default_packages}
 
 	linux-i686-default:
-	\tbase: ${base_linux_i686_default_packages}
-	\tall: ${all_linux_i686_default_packages}
+	    base    ${base_linux_i686_default_packages}
+	    all     ${all_linux_i686_default_packages}
 
 	linux-arm64-default:
 	linux-armhf-default:
-	\tbase: ${base_linux_arm64_default_packages}
-	\tall: ${all_linux_arm64_default_packages}
+	    base    ${base_linux_arm64_default_packages}
+	    all     ${all_linux_arm64_default_packages}
 
 	EOF
-	false
+	
+	exit
+}
+
+syntaxError() {
+	log ERROR "${1}" || true
+	echo >&2
+	printHelp
 }
 
 download_only='false'
@@ -1537,17 +1559,24 @@ do
 		require_theirs='true'
 		shift
 	;;
-	'--'*)
-		helpError
+	'-h'|'--help')
+		printHelp
+	;;
+	'-'*)
+		syntaxError 'Unknown option'
 	;;
 	*)
 		break
 	esac
 done
 
 # Usage
-if [ "${#}" -lt "2" ]; then
-	errorHelp
+if [ "${#}" -lt "1" ]
+then
+	syntaxError 'Missing platform and package(s)'
+elif [ "${#}" -lt "2" ]
+then
+	syntaxError 'Missing package(s)'
 fi
 
 # Do not reuse self-built curl from external_deps custom PATH
@@ -1556,9 +1585,9 @@ fi
 CURL="$(command -v curl)" || log ERROR "Command 'curl' not found"
 
 # Enable parallel build
-export MAKEFLAGS="-j`nproc 2> /dev/null || sysctl -n hw.ncpu 2> /dev/null || echo 1`"
+export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1)"
+export MAKEFLAGS="-j${CMAKE_BUILD_PARALLEL_LEVEL}"
 export SCONSFLAGS="${MAKEFLAGS}"
-export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc 2> /dev/null || sysctl -n hw.ncpu 2> /dev/null || echo 1)"
 
 # Setup platform
 platform="${1}"; shift
@@ -1568,11 +1597,14 @@ case "${platform}" in
 'all')
 	platform_list="${all_platforms}"
 ;;
-'build-linux')
-	platform_list="${linux_build_platforms}"
+'linux')
+	platform_list="${all_linux_platforms}"
+;;
+'windows')
+	platform_list="${all_windows_platforms}"
 ;;
-'build-macos')
-	platform_list="${macos_build_platforms}"
+'macos')
+	platform_list="${all_macos_platforms}"
 ;;
 *)
 	for known_platform in ${all_platforms}
@@ -1585,18 +1617,13 @@ case "${platform}" in
 	done
 	if [ -z "${platform_list}" ]
 	then
-		errorHelp
+		syntaxError 'Unknown platform'
 	fi
 ;;
 esac
 
 for PLATFORM in ${platform_list}
 do (
 	"setup_${PLATFORM}"
-
-	# Build packages
-	for pkg in "${@}"; do
-		cd "${WORK_DIR}"
-		"build_${pkg}"
-	done
+	build "${@}"
 ) done

src/engine/client/ClientApplication.cpp

@@ -80,19 +80,6 @@ class ClientApplication : public Application {
         }
 
         void Initialize() override {
-#if defined(__linux__) && defined(BUILD_GRAPHICAL_CLIENT)
-            // identify the game by its name in certain
-            // volume control / power control applets,
-            // for example, the one found on KDE:
-            // "Unvanquished is currently blocking sleep."
-            // instead of "My SDL application ..."
-            // this feature was introduced in SDL 2.0.22
-            SDL_SetHint("SDL_APP_NAME", PRODUCT_NAME);
-            // SDL_hints.h: #define SDL_HINT_APP_NAME "SDL_APP_NAME"
-            // don't use the macro here, in case
-            // SDL doesn't use current headers.
-#endif
-
             Hunk_Init();
 
             Com_Init();

src/engine/client/cl_main.cpp

@@ -1387,7 +1387,7 @@ static void CL_LoadRSAKeys()
 
 	if ( !f || len < 1 )
 	{
-		Log::Notice( "^2%s", "Daemon RSA public-key file not found, regenerating\n" );
+		Log::Notice( "^2Daemon RSA public-key file not found, regenerating" );
 		CL_GenerateRSAKeys( fileName );
 		return;
 	}

src/engine/framework/Resource.h

@@ -209,7 +209,7 @@ namespace Resource {
     Manager<T>::Manager(Str::StringRef defaultName): inRegistration(false), immediate(false) {
         defaultValue = RegisterInternal(defaultName);
         if (not defaultValue) {
-            Sys::Error("Couldn't load the default resource for %s\n", typeid(T).name());
+            Sys::Error("Couldn't load the default resource for %s", typeid(T).name());
         }
     }
 

src/engine/qcommon/crypto.h

@@ -27,10 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "q_shared.h"
 #include "qcommon.h"
 
+/* The Nettle headers include the GMP header, this disables the warning
+on GMP alone, not the whole Nettle. We don't use GMP directly ourselves. */
+#if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable : 4146) // "unary minus operator applied to unsigned type, result still unsigned"
 #include <gmp.h>
 #pragma warning(pop)
+#endif
 
 #include <nettle/bignum.h>
 #include <nettle/rsa.h>

src/engine/qcommon/files.cpp

@@ -722,7 +722,7 @@ bool FS_LoadServerPaks(const char* paks, bool isDemo)
 		Cmd::Args extrapaks(fs_extrapaks.Get());
 		for (auto& x: extrapaks) {
 			if (!FS_LoadPak(x))
-				Sys::Error("Could not load extra pak '%s'\n", x.c_str());
+				Sys::Error("Could not load extra pak '%s'", x.c_str());
 		}
 	}
 

src/engine/renderer/Material.cpp

@@ -1360,6 +1360,12 @@ void MaterialSystem::AddStage( MaterialSurface* surface, shaderStage_t* pStage,
 			continue;
 		}
 
+		if ( pStage->shader->reliefDepthScale != pStage2->shader->reliefDepthScale
+		     || pStage->shader->reliefOffsetBias != pStage2->shader->reliefOffsetBias )
+		{
+			continue;
+		}
+
 		if ( pStage->refractionIndexExp != pStage2->refractionIndexExp || pStage->specularExponentMin != pStage2->specularExponentMin
 			|| pStage->specularExponentMax != pStage2->specularExponentMax || pStage->fresnelPowerExp != pStage2->fresnelPowerExp
 			|| pStage->fresnelScaleExp != pStage2->fresnelScaleExp || pStage->fresnelBiasExp != pStage2->fresnelBiasExp

src/engine/renderer/Material.h

@@ -155,11 +155,6 @@ struct Material {
 	std::vector<Texture*> textures;
 
 	bool operator==( const Material& other ) {
-		if ( r_materialSeparatePerShader.Get() )
-		{
-			return refStage == other.refStage;
-		}
-
 		return program == other.program && stateBits == other.stateBits
 			&& fog == other.fog && cullType == other.cullType && usePolygonOffset == other.usePolygonOffset;
 	}