automatic import of chromiumopeneuler24.03_LTS_SP1

2 files changed, 63 insertions, 0 deletions

diff --git a/swiftshader-2.patch b/swiftshader-2.patch
new file mode 100644
index 0000000..64cfd36
--- /dev/null
+++ b/swiftshader-2.patch
@@ -0,0 +1,29 @@
+description: additional swiftshader stuff exposed by official builds
+author: Andres Salomon <dilinger@debian.org>
+
+--- a/chrome/BUILD.gn
++++ b/chrome/BUILD.gn
+@@ -1719,7 +1719,6 @@ if (is_linux || is_chromeos) {
+         ":chrome_symbols",
+       ]
+       if (is_linux) {
+-        deps += [ ":swiftshader_vk_symbols" ]
+       }
+       if (!is_chromeos) {
+         deps += [ ":angle_libvulkan_symbols" ]
+@@ -1752,6 +1751,7 @@ if (is_linux || is_chromeos) {
+ 
+       deps = [ "//components/crash/core/app:chrome_crashpad_handler" ]
+     }
++if (false) {
+     extract_symbols("swiftshader_vk_symbols") {
+       binary = "$root_out_dir/libvk_swiftshader.so"
+ 
+@@ -1764,6 +1764,7 @@ if (is_linux || is_chromeos) {
+ 
+       deps = [ "//third_party/swiftshader/src/Vulkan:swiftshader_libvulkan" ]
+     }
++}
+     extract_symbols("angle_egl_symbols") {
+       binary = "$root_out_dir/libEGL.so"
+ 
diff --git a/swiftshader.patch b/swiftshader.patch
new file mode 100644
index 0000000..dbafaec
--- /dev/null
+++ b/swiftshader.patch
@@ -0,0 +1,34 @@
+description: avoid building the swiftshader library
+author: Michael Gilbert <mgilbert@debian.org>
+
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -495,7 +495,7 @@ group("gn_all") {
+       ]
+     }
+ 
+-    if ((is_win || is_mac || is_linux || is_chromeos || is_fuchsia) &&
++    if (false &&
+         (target_cpu == "x86" || target_cpu == "x64")) {
+       deps += [
+         "//third_party/swiftshader/src/Vulkan:icd_file",
+--- a/third_party/angle/gni/angle.gni
++++ b/third_party/angle/gni/angle.gni
+@@ -171,7 +171,7 @@ declare_args() {
+        ((angle_use_x11 && !is_chromeos) || angle_use_wayland || is_castos)) &&
+       !is_fuchsia && !angle_is_winuwp && !is_ggp && !is_win_arm64
+ 
+-  angle_enable_vulkan =
++  angle_enable_vulkan = false &&
+       angle_has_build &&
+       !(is_android && build_with_chromium && is_official_build) &&
+       ((is_win && !angle_is_winuwp) ||
+--- a/gpu/vulkan/features.gni
++++ b/gpu/vulkan/features.gni
+@@ -14,5 +14,5 @@ declare_args() {
+   # Enable swiftshader vulkan. Disabling it can save build time, however
+   # --use-vulkan=swiftshader and some tests which use swiftshader vulkan will
+   # not work.
+-  enable_swiftshader_vulkan = true
++  enable_swiftshader_vulkan = false
+ }