From 6e836d9b31a38d2fad09ca8f34014c8acceca0a5 Mon Sep 17 00:00:00 2001 From: uzair Date: Wed, 23 Sep 2020 10:07:05 +0530 Subject: [PATCH] [M85 Dev][Tizen] Fix compiler errors for TV Below change fixes compiler errors for tizen tv profile and also enables gcc builds to use system libjpeg library due to [1]. [1]https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93022 Change-Id: I60e40eec93f7e2f9e3cbea2736c4a4c0ea4c5ecc Signed-off-by: uzair --- third_party/blink/renderer/modules/webaudio/oscillator_node.cc | 7 ++++--- third_party/blink/renderer/platform/widget/widget_base_client.h | 2 +- third_party/dav1d/BUILD.gn | 2 +- tizen_src/build/gn_chromiumefl.sh | 4 ++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/third_party/blink/renderer/modules/webaudio/oscillator_node.cc b/third_party/blink/renderer/modules/webaudio/oscillator_node.cc index 08f20fc..9245874 100644 --- a/third_party/blink/renderer/modules/webaudio/oscillator_node.cc +++ b/third_party/blink/renderer/modules/webaudio/oscillator_node.cc @@ -510,7 +510,7 @@ static float32x4_t v_wrap_virtual_index(float32x4_t x, // vcltq_f32 returns returns all 0xfffffff (-1) if a < b and if if not. const uint32x4_t cmp = vcltq_f32(r, vcvtq_f32_s32(f)); - f = vaddq_s32(f, static_cast(cmp)); + f = vaddq_s32(f, reinterpret_cast(cmp)); return vsubq_f32(x, vmulq_f32(vcvtq_f32_s32(f), wave_size)); } @@ -536,8 +536,9 @@ std::tuple OscillatorHandler::ProcessKRateVector( const float32x4_t v_wave_size = vdupq_n_f32(periodic_wave_size); const float32x4_t v_inv_wave_size = vdupq_n_f32(1.0f / periodic_wave_size); - const uint32x4_t v_read_mask = vdupq_n_s32(periodic_wave_size - 1); - const uint32x4_t v_one = vdupq_n_s32(1); + const uint32x4_t v_read_mask = + reinterpret_cast(vdupq_n_s32(periodic_wave_size - 1)); + const uint32x4_t v_one = reinterpret_cast(vdupq_n_s32(1)); const float32x4_t v_table_factor = vdupq_n_f32(table_interpolation_factor); diff --git a/third_party/blink/renderer/platform/widget/widget_base_client.h b/third_party/blink/renderer/platform/widget/widget_base_client.h index b4ff5ed..606deab 100644 --- a/third_party/blink/renderer/platform/widget/widget_base_client.h +++ b/third_party/blink/renderer/platform/widget/widget_base_client.h @@ -150,7 +150,7 @@ class WidgetBaseClient { mojo::PendingRemote host) = 0; // The FrameWidget interface if this is a FrameWidget. - virtual FrameWidget* FrameWidget() { return nullptr; } + virtual blink::FrameWidget* FrameWidget() { return nullptr; } // Send the composition change to the browser. virtual void SendCompositionRangeChanged( diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn index 788dc6c..31ac21e 100644 --- a/third_party/dav1d/BUILD.gn +++ b/third_party/dav1d/BUILD.gn @@ -113,7 +113,7 @@ if (is_win) { if (is_mac) { dav1d_copts += [ "-D_DARWIN_C_SOURCE" ] } - if (is_linux || is_android || current_os == "aix") { + if (is_linux || is_android || is_tizen || current_os == "aix") { if (!is_clang) { dav1d_copts += [ "-D_GNU_SOURCE" ] } diff --git a/tizen_src/build/gn_chromiumefl.sh b/tizen_src/build/gn_chromiumefl.sh index c493575..7e073b4 100755 --- a/tizen_src/build/gn_chromiumefl.sh +++ b/tizen_src/build/gn_chromiumefl.sh @@ -126,6 +126,9 @@ add_desktop_flags() { local is_clang=false if [ $USE_CLANG == 1 ]; then is_clang=true + else + ADDITIONAL_GN_PARAMETERS+="use_system_libjpeg=true + " fi ADDITIONAL_GN_PARAMETERS+="gcc_ver=\"$(getGccVersion)\" is_clang=${is_clang} @@ -192,6 +195,7 @@ add_tizen_flags() { else ADDITIONAL_GN_PARAMETERS+="host_toolchain=\"//tizen_src/build/toolchain/tizen:tizen_$host_arch\" v8_snapshot_toolchain=\"//tizen_src/build/toolchain/tizen:tizen_$host_arch\" + use_system_libjpeg=true " fi -- 2.7.4