6acce284c4
[ci skip] - Update vaapi patch from Ubuntu/Debian patch. - Add two build fix patches. - Built for x86_64, x86_64-musl, i686 - Tested on x86_64
49 lines
2.8 KiB
Diff
49 lines
2.8 KiB
Diff
From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
|
|
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
|
Date: Mon, 29 Jul 2019 10:54:28 +0000
|
|
Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
|
|
|
|
When building HarfBuzz as part of Chromium, there is a single source set
|
|
with all the files we need in the build.
|
|
|
|
Upstream HarfBuzz, on the other hand, produces a few different libraries:
|
|
harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is
|
|
true, we were only looking for (and using) harfbuzz.pc with pkg-config even
|
|
though we also use symbols from libharfbuzz-subset.so. This resulted in
|
|
errors when linking:
|
|
|
|
ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
|
|
SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
|
|
ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
|
|
ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
|
|
ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
|
|
ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
|
|
ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
|
|
|
|
as reported in
|
|
https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
|
|
|
|
Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
|
|
Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
|
Commit-Queue: Dominik Röttsches <drott@chromium.org>
|
|
Reviewed-by: Dominik Röttsches <drott@chromium.org>
|
|
Cr-Commit-Position: refs/heads/master@{#681760}
|
|
---
|
|
|
|
diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
|
|
index 37d8e33..72013eb1d 100644
|
|
--- third_party/harfbuzz-ng/BUILD.gn
|
|
+++ third_party/harfbuzz-ng/BUILD.gn
|
|
@@ -16,7 +16,10 @@
|
|
"//third_party:freetype_harfbuzz",
|
|
"//third_party/freetype:freetype_source",
|
|
]
|
|
- packages = [ "harfbuzz" ]
|
|
+ packages = [
|
|
+ "harfbuzz",
|
|
+ "harfbuzz-subset",
|
|
+ ]
|
|
}
|
|
} else {
|
|
config("harfbuzz_config") {
|