Merge branch 'master' into for-0.56.0/sync

Author: illwieckz

cmake/DaemonSourceGenerator.cmake

@@ -86,15 +86,17 @@ macro(daemon_embed_files basename dir list format targetname)
 		set(DAEMON_EMBEDDED_FILES_HEADER "${DAEMON_EMBEDDED_SUBDIR}/DaemonEmbeddedFiles.h")
 
 		string(APPEND embed_header_text
+			"// Automatically generated, do not modify!\n"
 			"#ifndef DAEMON_EMBEDDED_FILES_H_\n"
 			"#define DAEMON_EMBEDDED_FILES_H_\n"
+			"#include <cstddef>\n"
 			"#include <unordered_map>\n"
 			"#include <string>\n"
 			"\n"
 			"struct embeddedFileMapEntry_t\n"
 			"{\n"
-			"	const char* data;\n"
-			"	size_t size;\n"
+			"\tconst char* data;\n"
+			"\tsize_t size;\n"
 			"};\n"
 			"\n"
 			"using embeddedFileMap_t = std::unordered_map<std::string, const embeddedFileMapEntry_t>;\n"

external_deps/build.sh

@@ -249,7 +249,7 @@ cmake_build() {
 	cmake --install build --strip
 }
 
-# Build pkg-config, needed for opusfile and SDL3.
+# Build pkg-config, needed for opusfile.
 # As a host-mode dependency it must be provided by the system when cross-compiling.
 build_pkgconfig() {
 	local dir_name="pkg-config-${PKGCONFIG_VERSION}"
@@ -262,7 +262,12 @@ build_pkgconfig() {
 
 	cd "${dir_name}"
 
-	CFLAGS="${CFLAGS} -Wno-error=int-conversion" \
+	# Reset the environment variables, we don't cross-compile this,
+	# it is part of the cross-compilation toolchain.
+	# CXXFLAGS is unused.
+	CFLAGS='-Wno-error=int-conversion' \
+	LDFLAGS='' \
+	HOST='' \
 	configure_build \
 		--with-internal-glib
 }
@@ -765,6 +770,7 @@ build_openal() {
 		cd "${dir_name}"
 
 		cmake_build \
+			-DALSOFT_UTILS=OFF \
 			"${openal_cmake_args[@]}"
 		;;
 	esac
@@ -1416,7 +1422,7 @@ setup_macos-amd64-default() {
 	MACOS_ARCH=x86_64
 	# OpenAL requires 10.14.
 	export MACOSX_DEPLOYMENT_TARGET=10.14 # works with CMake
-	common_setup macos x86_64-apple-darwin11
+	common_setup macos "x86_64-apple-macos${MACOSX_DEPLOYMENT_TARGET}"
 }
 
 # Set up environment for 32-bit i686 Linux

libs/nacl/native_client/src/shared/imc/posix/nacl_imc_posix.cc

@@ -80,9 +80,8 @@ static int AshmemCreateRegion(size_t size) {
 int NaClWouldBlock(void) {
   return errno == EAGAIN;
 }
-
 int NaClGetLastErrorString(char* buffer, size_t length) {
-#if NACL_LINUX && !NACL_ANDROID
+#if NACL_LINUX && defined(__GLIBC__)
   char* message;
   /*
    * Note some Linux distributions provide only GNU version of strerror_r().

src/engine/renderer/tr_main.cpp

@@ -94,8 +94,8 @@ void R_CalcTangents( vec3_t tangent, vec3_t binormal,
 	binormal[1] = dtx[0] * dpy[1] - dpx[1] * dty[0];
 	binormal[2] = dtx[0] * dpy[2] - dpx[2] * dty[0];
 
-	VectorNormalizeFast( tangent );
-	VectorNormalizeFast( binormal );
+	VectorNormalize( tangent );
+	VectorNormalize( binormal );
 }
 
 void R_CalcTangents( vec3_t tangent, vec3_t binormal,