parent
f395fe077e
commit
1e2f91b923
@ -0,0 +1,28 @@
|
|||||||
|
From a61a70605f9efc81fead5bf6984bc5ce39f1569d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Fri, 27 May 2022 18:11:52 +0000
|
||||||
|
Subject: [PATCH] libstdc++: fix incomplete type of
|
||||||
|
content::ContentRendererClient
|
||||||
|
|
||||||
|
Destructor of std::unique_ptr in libstdc++ uses sizeof() which
|
||||||
|
requires full definition of media::AudioEncoder for return type of
|
||||||
|
cast_streaming::ResourceProvider.
|
||||||
|
---
|
||||||
|
content/public/renderer/content_renderer_client.cc | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
|
||||||
|
index 63456aa..637a2a7 100644
|
||||||
|
--- a/content/public/renderer/content_renderer_client.cc
|
||||||
|
+++ b/content/public/renderer/content_renderer_client.cc
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
|
||||||
|
#include "base/command_line.h"
|
||||||
|
#include "build/build_config.h"
|
||||||
|
+#include "components/cast_streaming/renderer/public/resource_provider.h"
|
||||||
|
#include "content/public/common/content_switches.h"
|
||||||
|
#include "media/base/demuxer.h"
|
||||||
|
#include "media/base/renderer_factory.h"
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
@ -0,0 +1,76 @@
|
|||||||
|
diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
|
||||||
|
--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip 2022-08-18 23:16:03.451728329 +0000
|
||||||
|
+++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc 2022-08-18 23:16:23.966049114 +0000
|
||||||
|
@@ -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 <minizip/ioapi.h>
|
||||||
|
+#include <minizip/unzip.h>
|
||||||
|
#include "flatbuffers/flatbuffers.h" // from @flatbuffers
|
||||||
|
#include "tensorflow/lite/schema/schema_generated.h"
|
||||||
|
#include "tensorflow_lite_support/cc/common.h"
|
||||||
|
diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
|
||||||
|
--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip 2022-08-18 23:16:52.463105585 +0000
|
||||||
|
+++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc 2022-08-18 23:17:12.849430606 +0000
|
||||||
|
@@ -19,8 +19,8 @@ limitations under the License.
|
||||||
|
#include <cstring>
|
||||||
|
#include <functional>
|
||||||
|
|
||||||
|
-#include "contrib/minizip/ioapi.h"
|
||||||
|
-#include "contrib/minizip/zip.h"
|
||||||
|
+#include <minizip/ioapi.h>
|
||||||
|
+#include <minizip/zip.h>
|
||||||
|
#include "flatbuffers/flatbuffers.h" // from @flatbuffers
|
||||||
|
#include "tensorflow/lite/schema/schema_generated.h"
|
||||||
|
#include "tensorflow_lite_support/cc/common.h"
|
||||||
|
diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
|
||||||
|
--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip 2022-08-18 23:18:14.697382850 +0000
|
||||||
|
+++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc 2022-08-18 23:18:27.148970583 +0000
|
||||||
|
@@ -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 <minizip/ioapi.h>
|
||||||
|
|
||||||
|
namespace tflite {
|
||||||
|
namespace metadata {
|
||||||
|
diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
|
||||||
|
--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h.system-minizip 2022-08-18 20:14:28.116854693 +0000
|
||||||
|
+++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h 2022-08-18 20:14:28.115854726 +0000
|
||||||
|
@@ -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 <minizip/ioapi.h>
|
||||||
|
|
||||||
|
namespace tflite {
|
||||||
|
namespace metadata {
|
||||||
|
diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
|
||||||
|
--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip 2022-08-18 23:19:14.807392634 +0000
|
||||||
|
+++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc 2022-08-18 23:19:31.177850617 +0000
|
||||||
|
@@ -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 <minizip/ioapi.h>
|
||||||
|
|
||||||
|
namespace tflite {
|
||||||
|
namespace metadata {
|
||||||
|
diff -up chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
|
||||||
|
--- chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip 2022-08-18 20:14:28.116854693 +0000
|
||||||
|
+++ chromium-104.0.5112.101/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h 2022-08-18 20:14:28.116854693 +0000
|
||||||
|
@@ -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 <minizip/ioapi.h>
|
||||||
|
|
||||||
|
namespace tflite {
|
||||||
|
namespace metadata {
|
Loading…
Reference in new issue