mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-23 22:52:49 +00:00
Built-in FFmpeg did not build with system harfbuzz-ng
../../third_party/ffmpeg/../../third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc:320:5: error: use of undeclared identifier 'hb_font_funcs_set_glyph_h_advances_func'; did you mean 'hb_font_funcs_set_glyph_h_advance_func'? hb_font_funcs_set_glyph_h_advances_func( ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ hb_font_funcs_set_glyph_h_advance_func /usr/include/harfbuzz/hb-font.h:247:1: note: 'hb_font_funcs_set_glyph_h_advance_func' declared here hb_font_funcs_set_glyph_h_advance_func (hb_font_funcs_t *ffuncs, ^ In file included from gen/third_party/blink/renderer/platform/platform_jumbo_23.cc:9: ../../third_party/ffmpeg/../../third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc:321:16: error: cannot initialize a parameter of type 'hb_font_get_glyph_h_advance_func_t' (aka 'int (*)(hb_font_t *, void *, unsigned int, void *)') with an lvalue of type 'void (hb_font_t *, void *, unsigned int, hb_codepoint_t *, unsigned int, hb_position_t *, unsigned int, void *)' (aka 'void (hb_font_t *, void *, unsigned int, unsigned int *, unsigned int, int *, unsigned int, void *)'): different number of parameters (4 vs 8) funcs, HarfBuzzGetGlyphHorizontalAdvances, nullptr, nullptr); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/harfbuzz/hb-font.h:248:41: note: passing argument to parameter 'func' here hb_font_get_glyph_h_advance_func_t func,
This commit is contained in:
parent
8e84209690
commit
0bd3e8539e
1 changed files with 3 additions and 3 deletions
|
@ -152,7 +152,7 @@ BuildRequires: pkgconfig(gnome-keyring-1)
|
|||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(harfbuzz)
|
||||
#BuildRequires: pkgconfig(harfbuzz)
|
||||
%if 0%{icu}
|
||||
BuildRequires: pkgconfig(icu-i18n)
|
||||
%endif
|
||||
|
@ -486,7 +486,6 @@ CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-v
|
|||
clang_use_chrome_plugins=false \
|
||||
clang_base_path="%{_prefix}" \
|
||||
use_system_freetype=true \
|
||||
use_system_harfbuzz=true \
|
||||
use_vaapi=%{is_vaapi} \
|
||||
v8_use_external_startup_data=false \
|
||||
google_api_key="%{google_api_key}" \
|
||||
|
@ -501,8 +500,9 @@ CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-v
|
|||
#is_nacl_glibc=false \
|
||||
#fatal_linker_warnings=false \
|
||||
|
||||
%define system_gn_list flac libxslt snappy yasm libdrm fontconfig freetype harfbuzz-ng libusb
|
||||
%define system_gn_list flac libxslt snappy yasm libdrm fontconfig freetype libusb
|
||||
# libpng, libtiff
|
||||
# harfbuzz-ng
|
||||
# ffmpeg
|
||||
# libvpx : system libvpx will normally be much older than the bundled one
|
||||
# opus
|
||||
|
|
Loading…
Add table
Reference in a new issue