gentoo resync : 29.12.2022

4 files changed, 122 insertions, 36 deletions

diff --git a/www-client/chromium/files/chromium-101-libxml-unbundle.patch b/www-client/chromium/files/chromium-101-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8f8eaf..000000000000
--- a/www-client/chromium/files/chromium-101-libxml-unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
-     ":xml_reader",
-     ":xml_writer",
-     "//base/test:test_support",
-+    "//services/data_decoder:lib",
-     "//services/data_decoder:xml_parser_fuzzer_deps",
-   ]
-   sources = [
diff --git a/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch b/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch
new file mode 100644
index 000000000000..75f78f36bc3d
--- /dev/null
+++ b/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch
@@ -0,0 +1,52 @@
+--- a/third_party/swiftshader/src/Vulkan/BUILD.gn
++++ b/third_party/swiftshader/src/Vulkan/BUILD.gn
+@@ -16,14 +16,22 @@ import("//build_overrides/build.gni")
+ import("../swiftshader.gni")
+ import("vulkan.gni")
+ 
++if (is_linux) {
++  import("//build/config/ozone.gni")
++}
++
+ # Need a separate config to ensure the warnings are added to the end.
+ config("swiftshader_libvulkan_private_config") {
+   if (is_linux) {
+     defines = [
+       "VK_USE_PLATFORM_XCB_KHR",
+-      "VK_USE_PLATFORM_WAYLAND_KHR",
+       "VK_EXPORT=__attribute__((visibility(\"default\")))",
+     ]
++    if (ozone_platform_wayland) {
++      defines += [
++        "VK_USE_PLATFORM_WAYLAND_KHR",
++      ]
++    }
+   } else if (is_chromeos) {
+     defines = [
+       "VK_EXPORT=__attribute__((visibility(\"default\")))",
+--- a/third_party/swiftshader/src/WSI/BUILD.gn
++++ b/third_party/swiftshader/src/WSI/BUILD.gn
+@@ -42,15 +42,19 @@ swiftshader_source_set("WSI") {
+ 
+   if (is_linux) {
+     sources += [
+-      "WaylandSurfaceKHR.cpp",
+-      "WaylandSurfaceKHR.hpp",
+       "XcbSurfaceKHR.cpp",
+       "XcbSurfaceKHR.hpp",
+-      "libWaylandClient.cpp",
+-      "libWaylandClient.hpp",
+       "libXCB.cpp",
+       "libXCB.hpp",
+     ]
++    if (ozone_platform_wayland) {
++      sources += [
++        "WaylandSurfaceKHR.cpp",
++        "WaylandSurfaceKHR.hpp",
++        "libWaylandClient.cpp",
++        "libWaylandClient.hpp",
++      ]
++    }
+   }
+ 
+   if (is_win) {
diff --git a/www-client/chromium/files/chromium-104-tflite-system-zlib.patch b/www-client/chromium/files/chromium-104-tflite-system-zlib.patch
new file mode 100644
index 000000000000..91ef5726bc8d
--- /dev/null
+++ b/www-client/chromium/files/chromium-104-tflite-system-zlib.patch
@@ -0,0 +1,70 @@
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
+@@ -21,8 +21,8 @@ limitations under the License.
+ #include "absl/status/status.h"        // from @com_google_absl
+ #include "absl/strings/str_format.h"   // from @com_google_absl
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
+-#include "contrib/minizip/unzip.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/unzip.h"
+ #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+ #include "tensorflow/lite/schema/schema_generated.h"
+ #include "tensorflow_lite_support/cc/common.h"
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
+@@ -19,8 +19,8 @@ limitations under the License.
+ #include <cstring>
+ #include <functional>
+ 
+-#include "contrib/minizip/ioapi.h"
+-#include "contrib/minizip/zip.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/zip.h"
+ #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+ #include "tensorflow/lite/schema/schema_generated.h"
+ #include "tensorflow_lite_support/cc/common.h"
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdlib>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdlib>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
diff --git a/www-client/chromium/files/chromium-97-arm-tflite-cast.patch b/www-client/chromium/files/chromium-97-arm-tflite-cast.patch
deleted file mode 100644
index 843a384c76d3..000000000000
--- a/www-client/chromium/files/chromium-97-arm-tflite-cast.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-vreinterpret_s32_s8() casts int8x8_t to int32x2_t. However, third argument
-of vdotq_lane_s32() is of type int8x8_t.
-
---- a/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h
-+++ b/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h
-@@ -129,16 +129,14 @@ inline int32x4_t vdotq_four_lane_s32(int32x4_t acc, int8x16_t lhs,
-                                      int8x16_t rhs, const int lane) {
-   switch (lane) {
-     case 0:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 0);
-+      return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 0);
-     case 1:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 1);
-+      return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 1);
-     case 2:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)),
--                            0);
-+      return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 0);
-     case 3:
-     default:
--      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)),
--                            1);
-+      return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 1);
-   }
- }
-