summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShatur952020-01-22 11:15:32 +0200
committerShatur952020-01-25 13:26:32 +0200
commit33090f37f15387b76b462394434cb3392c51c182 (patch)
treec5bf61c32379b8b379cdf6fa4a5803755a4830bb
parente90a624ed09c34c58b88dff54fdf61c92b13f4f7 (diff)
downloadaur-33090f37f15387b76b462394434cb3392c51c182.tar.gz
Revert "Enable Clang 9 support"
This reverts commit e90a624ed09c34c58b88dff54fdf61c92b13f4f7.
-rw-r--r--.SRCINFO6
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD33
-rw-r--r--feditorstyle-undefined-reference.patch10
-rw-r--r--unreal.patch53
5 files changed, 13 insertions, 91 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e05dbacc79d..366a268a59d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = unreal-engine
pkgdesc = A 3D game engine by Epic Games which can be used non-commercially for free.
pkgver = 4.24.1
- pkgrel = 5
+ pkgrel = 6
url = https://www.unrealengine.com/
arch = x86_64
license = custom:UnrealEngine
@@ -23,12 +23,8 @@ pkgbase = unreal-engine
options = staticlibs
source = com.unrealengine.UE4Editor.desktop
source = use-arch-mono.patch
- source = unreal.patch
- source = feditorstyle-undefined-reference.patch
sha256sums = fa4bd19ab53e91cc8b4ae6208452a7fe986a08047617213d6250b43e7a140bf3
sha256sums = 90a112f72a498f50dafad4feeaf7c551fe4e19830610bcef634f8e23d3d283b3
- sha256sums = d3686d76fbdd2e80d8960ee21ad5ab7769451c4a11b980ac3df699fde339e42f
- sha256sums = 52d3bed7f95906aab3313e4beb263ba505751fb066230bf67f6bedade0ab6e19
pkgname = unreal-engine
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 72b29200322..00000000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-unreal-engine-*
-UnrealEngine/*
diff --git a/PKGBUILD b/PKGBUILD
index 536f6f5e63b..699ae014b21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# The source is about 200 MiB, with an extra ~11 GiB of dependencies downloaded in Setup.sh, and may take several hours to compile.
pkgname='unreal-engine'
pkgver=4.24.1
-pkgrel=5
+pkgrel=6
pkgdesc='A 3D game engine by Epic Games which can be used non-commercially for free.'
arch=('x86_64')
url='https://www.unrealengine.com/'
@@ -19,14 +19,9 @@ optdepends=('qt5-base: qmake build system for projects'
'clion: IDE for projects')
license=('custom:UnrealEngine')
source=('com.unrealengine.UE4Editor.desktop'
- 'use-arch-mono.patch'
- 'unreal.patch'
- 'feditorstyle-undefined-reference.patch')
-
+ 'use-arch-mono.patch')
sha256sums=('fa4bd19ab53e91cc8b4ae6208452a7fe986a08047617213d6250b43e7a140bf3'
- '90a112f72a498f50dafad4feeaf7c551fe4e19830610bcef634f8e23d3d283b3'
- 'd3686d76fbdd2e80d8960ee21ad5ab7769451c4a11b980ac3df699fde339e42f'
- '28842509b38eb4d1d0c328af0f8ab2c5f53849a9815d061fbb199563880b046f')
+ '90a112f72a498f50dafad4feeaf7c551fe4e19830610bcef634f8e23d3d283b3')
options=(strip staticlibs) # Package is 3 Gib smaller with "strip" but it takes a long time and generates many warnings
prepare() {
@@ -50,33 +45,29 @@ prepare() {
fi
patch Engine/Build/BatchFiles/Linux/SetupMono.sh $srcdir/use-arch-mono.patch # Use system mono
- patch Engine/Source/Runtime/Launch/Launch.Build.cs $srcdir/feditorstyle-undefined-reference.patch
- patch -p1 -i $srcdir/unreal.patch
-
+
# Qt Creator source code access
if [ ! -d Engine/Plugins/Developer/QtCreatorSourceCodeAccess ]
then
git -C Engine/Plugins/Developer clone --depth=1 git@github.com:fire/QtCreatorSourceCodeAccess
fi
- touch Engine/Build/PerforceBuild.txt
export TERM=xterm
./Setup.sh
- ./GenerateProjectFiles.sh -makefile -ForceUseSystemCompiler
+ ./GenerateProjectFiles.sh -makefile
}
build() {
cd $pkgname
# Build all targets from the "all" rule separately, because building multiple targets in parallel results in an error (but building one target with multiple threads is possible)
- MAKE_ARGS="ARGS=-ForceUseSystemCompiler"
- make CrashReportClient-Linux-Shipping $MAKE_ARGS
- make CrashReportClientEditor-Linux-Shipping $MAKE_ARGS
- make ShaderCompileWorker $MAKE_ARGS
- make UnrealLightmass $MAKE_ARGS
- make UnrealFrontend $MAKE_ARGS
- make UE4Editor $MAKE_ARGS
- make UnrealInsights $MAKE_ARGS
+ make CrashReportClient-Linux-Shipping
+ make CrashReportClientEditor-Linux-Shipping
+ make ShaderCompileWorker
+ make UnrealLightmass
+ make UnrealFrontend
+ make UE4Editor
+ make UnrealInsights
}
package() {
diff --git a/feditorstyle-undefined-reference.patch b/feditorstyle-undefined-reference.patch
deleted file mode 100644
index d2042461bc7..00000000000
--- a/feditorstyle-undefined-reference.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Launch.Build.cs 2020-01-10 15:52:46.177542575 -0600
-+++ Launch.Build.cs_new 2020-01-10 15:51:39.197541686 -0600
-@@ -183,6 +183,7 @@
-
- PrivateDependencyModuleNames.AddRange(new string[] {
- "SourceControl",
-+ "EditorStyle",
- "UnrealEd",
- "DesktopPlatform",
- "PIEPreviewDeviceProfileSelector",
diff --git a/unreal.patch b/unreal.patch
deleted file mode 100644
index 119874a9b87..00000000000
--- a/unreal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
-index 1dc0d9b4331..b46d10c9ef5 100644
---- a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
-+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/LinuxToolChain.cs
-@@ -57,9 +57,6 @@ namespace UnrealBuildTool
- /** Whether or not to preserve the portable symbol file produced by dump_syms */
- bool bPreservePSYM = false;
-
-- /** Platform SDK to use */
-- protected LinuxPlatformSDK PlatformSDK;
--
- /** Toolchain information to print during the build. */
- protected string ToolchainInfo;
-
-@@ -163,10 +160,10 @@ namespace UnrealBuildTool
- throw new BuildException("Unable to build: no compatible clang version found. Please run Setup.sh");
- }
- // prevent unknown clangs since the build is likely to fail on too old or too new compilers
-- else if ((CompilerVersionMajor * 10 + CompilerVersionMinor) > 80 || (CompilerVersionMajor * 10 + CompilerVersionMinor) < 60)
-+ else if ((CompilerVersionMajor * 10 + CompilerVersionMinor) > 90 || (CompilerVersionMajor * 10 + CompilerVersionMinor) < 60)
- {
- throw new BuildException(
-- string.Format("This version of the Unreal Engine can only be compiled with clang 8.0, 7.0 and 6.0. clang {0} may not build it - please use a different version.",
-+ string.Format("This version of the Unreal Engine can only be compiled with clang 9.0 8.0, 7.0 and 6.0. clang {0} may not build it - please use a different version.",
- CompilerVersionString)
- );
- }
-diff --git a/Engine/Source/Programs/UnrealBuildTool/ToolChain/UEToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/ToolChain/UEToolChain.cs
-index fbfc9a7f7a4..cbcd2a341b5 100644
---- a/Engine/Source/Programs/UnrealBuildTool/ToolChain/UEToolChain.cs
-+++ b/Engine/Source/Programs/UnrealBuildTool/ToolChain/UEToolChain.cs
-@@ -12,6 +12,9 @@ namespace UnrealBuildTool
- {
- abstract class UEToolChain
- {
-+ /** Platform SDK to use */
-+ protected LinuxPlatformSDK PlatformSDK;
-+
- public UEToolChain()
- {
- }
-diff --git a/Engine/Source/Runtime/Core/Public/Unix/UnixSystemIncludes.h b/Engine/Source/Runtime/Core/Public/Unix/UnixSystemIncludes.h
-index ec5829a834e..79702a4b9fe 100644
---- a/Engine/Source/Runtime/Core/Public/Unix/UnixSystemIncludes.h
-+++ b/Engine/Source/Runtime/Core/Public/Unix/UnixSystemIncludes.h
-@@ -31,7 +31,6 @@
- #include <utime.h>
- #include <execinfo.h>
- #include <signal.h>
--#include <sys/sysctl.h>
- #if PLATFORM_ENABLE_VECTORINTRINSICS
- #include <xmmintrin.h>
- #endif // PLATFORM_RASPBERRY