diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-16 02:29:20 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-16 02:29:20 +0100 |
commit | 7896e968620f545121daeea31881814ccc8d4f47 (patch) | |
tree | 537e4de8b13e1b2add5e11c9ecf4c7abf68a0a94 /dev-games/godot/files | |
parent | 7255c5d5fcd8fcdd07d2791563dc43bf4e14cf3a (diff) |
gentoo auto-resync : 16:08:2022 - 02:29:20
Diffstat (limited to 'dev-games/godot/files')
-rw-r--r-- | dev-games/godot/files/godot-3.5-musl.patch | 9 | ||||
-rw-r--r-- | dev-games/godot/files/godot-3.5-scons.patch | 74 | ||||
-rw-r--r-- | dev-games/godot/files/godot-4.0-musl.patch | 9 | ||||
-rw-r--r-- | dev-games/godot/files/godot-4.0_alpha14-scons.patch | 29 |
4 files changed, 121 insertions, 0 deletions
diff --git a/dev-games/godot/files/godot-3.5-musl.patch b/dev-games/godot/files/godot-3.5-musl.patch new file mode 100644 index 000000000000..0738b035480f --- /dev/null +++ b/dev-games/godot/files/godot-3.5-musl.patch @@ -0,0 +1,9 @@ +crash handler requires glibc or libexecinfo (not packaged), +and is always enabled if build the editor (release_debug) +--- a/platform/x11/crash_handler_x11.cpp ++++ b/platform/x11/crash_handler_x11.cpp +@@ -38,3 +38,3 @@ + +-#ifdef DEBUG_ENABLED ++#if defined(DEBUG_ENABLED) && defined(__GLIBC__) + #define CRASH_HANDLER_ENABLED 1 diff --git a/dev-games/godot/files/godot-3.5-scons.patch b/dev-games/godot/files/godot-3.5-scons.patch new file mode 100644 index 000000000000..b8ed7f50311d --- /dev/null +++ b/dev-games/godot/files/godot-3.5-scons.patch @@ -0,0 +1,74 @@ +* add option to respect AR + (respecting PKG_CONFIG is handled in the ebuild) +* handle recastnavigation unbundling +* remove unnecessary opusfile +* remove unnecessary -no-pie +* remove -pipe from LDFLAGS, may "possibly" be relevant to: + https://bugs.gentoo.org/861689 + https://github.com/godotengine/godot/commit/f035e784 +--- a/SConstruct ++++ b/SConstruct +@@ -192,4 +192,5 @@ + opts.Add("CXX", "C++ compiler") + opts.Add("CC", "C compiler") ++opts.Add("AR", "Archiver") + opts.Add("LINK", "Linker") + opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") +--- a/platform/server/detect.py ++++ b/platform/server/detect.py +@@ -135,5 +135,4 @@ + + env.Append(CCFLAGS=["-pipe"]) +- env.Append(LINKFLAGS=["-pipe"]) + + ## Dependencies +@@ -178,4 +177,7 @@ + env.ParseConfig("pkg-config libenet --cflags --libs") + ++ if not env["builtin_recast"]: ++ env.ParseConfig("pkg-config recastnavigation --cflags --libs") ++ + if not env["builtin_squish"]: + env.ParseConfig("pkg-config libsquish --cflags --libs") +@@ -205,5 +207,5 @@ + if not env["builtin_opus"]: + env["builtin_libogg"] = False # Needed to link against system opus +- env.ParseConfig("pkg-config opus opusfile --cflags --libs") ++ env.ParseConfig("pkg-config opus --cflags --libs") + + if not env["builtin_libogg"]: +--- a/platform/x11/detect.py ++++ b/platform/x11/detect.py +@@ -232,17 +232,5 @@ + + env.Append(CCFLAGS=["-pipe"]) +- env.Append(LINKFLAGS=["-pipe"]) + +- # Check for gcc version >= 6 before adding -no-pie +- version = get_compiler_version(env) or [-1, -1] +- if using_gcc(env): +- if version[0] >= 6: +- env.Append(CCFLAGS=["-fpie"]) +- env.Append(LINKFLAGS=["-no-pie"]) +- # Do the same for clang should be fine with Clang 4 and higher +- if using_clang(env): +- if version[0] >= 4: +- env.Append(CCFLAGS=["-fpie"]) +- env.Append(LINKFLAGS=["-no-pie"]) + + ## Dependencies +@@ -298,4 +286,7 @@ + env.ParseConfig("pkg-config libenet --cflags --libs") + ++ if not env["builtin_recast"]: ++ env.ParseConfig("pkg-config recastnavigation --cflags --libs") ++ + if not env["builtin_squish"]: + env.ParseConfig("pkg-config libsquish --cflags --libs") +@@ -325,5 +316,5 @@ + if not env["builtin_opus"]: + env["builtin_libogg"] = False # Needed to link against system opus +- env.ParseConfig("pkg-config opus opusfile --cflags --libs") ++ env.ParseConfig("pkg-config opus --cflags --libs") + + if not env["builtin_libogg"]: diff --git a/dev-games/godot/files/godot-4.0-musl.patch b/dev-games/godot/files/godot-4.0-musl.patch new file mode 100644 index 000000000000..50c5c334773f --- /dev/null +++ b/dev-games/godot/files/godot-4.0-musl.patch @@ -0,0 +1,9 @@ +crash handler requires glibc or libexecinfo (not packaged), +and is always enabled if build the editor (release_debug) +--- a/platform/linuxbsd/crash_handler_linuxbsd.cpp ++++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp +@@ -38,3 +38,3 @@ + +-#ifdef DEBUG_ENABLED ++#if defined(DEBUG_ENABLED) && defined(__GLIBC__) + #define CRASH_HANDLER_ENABLED 1 diff --git a/dev-games/godot/files/godot-4.0_alpha14-scons.patch b/dev-games/godot/files/godot-4.0_alpha14-scons.patch new file mode 100644 index 000000000000..295f471d525b --- /dev/null +++ b/dev-games/godot/files/godot-4.0_alpha14-scons.patch @@ -0,0 +1,29 @@ +* add option to respect AR + (respecting PKG_CONFIG is handled in the ebuild) +* fix icu unbundling underlinking +* handle recastnavigation unbundling +--- a/SConstruct ++++ b/SConstruct +@@ -233,4 +233,5 @@ + opts.Add("CXX", "C++ compiler") + opts.Add("CC", "C compiler") ++opts.Add("AR", "Archiver") + opts.Add("LINK", "Linker") + opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") +--- a/platform/linuxbsd/detect.py ++++ b/platform/linuxbsd/detect.py +@@ -238,5 +238,5 @@ + + if not env["builtin_icu"]: +- env.ParseConfig("pkg-config icu-uc --cflags --libs") ++ env.ParseConfig("pkg-config icu-i18n --cflags --libs") + + if not env["builtin_harfbuzz"]: +@@ -249,4 +249,7 @@ + env.ParseConfig("pkg-config libenet --cflags --libs") + ++ if not env["builtin_recast"]: ++ env.ParseConfig("pkg-config recastnavigation --cflags --libs") ++ + if not env["builtin_squish"]: + env.ParseConfig("pkg-config libsquish --cflags --libs") |