1 |
commit: 19050b84a294b9807bd6e755b75230141892f195 |
2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 1 19:32:56 2016 +0000 |
4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 1 19:32:56 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19050b84 |
7 |
|
8 |
www-client/chromium: dev channel bump (54.0.2810.2) |
9 |
|
10 |
Fix build with system libpng (bug #578212). |
11 |
|
12 |
Fix build with system libvpx (bug #567652 by Rok Kralj). |
13 |
|
14 |
Package-Manager: portage-2.2.28 |
15 |
|
16 |
www-client/chromium/Manifest | 1 + |
17 |
www-client/chromium/chromium-54.0.2810.2.ebuild | 727 +++++++++++++++++++++ |
18 |
www-client/chromium/files/chromium-gn-r3.patch | 21 + |
19 |
.../files/chromium-last-commit-position-r1.patch | 26 + |
20 |
.../chromium/files/chromium-system-ffmpeg-r3.patch | 37 +- |
21 |
.../chromium/files/chromium-system-jinja-r12.patch | 79 +++ |
22 |
6 files changed, 860 insertions(+), 31 deletions(-) |
23 |
|
24 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
25 |
index 5f6b2e2..909cb50 100644 |
26 |
--- a/www-client/chromium/Manifest |
27 |
+++ b/www-client/chromium/Manifest |
28 |
@@ -1,3 +1,4 @@ |
29 |
DIST chromium-52.0.2743.82.tar.xz 458110272 SHA256 a7de6015df9cf685d68efd1e070ae9c706c723cd9395d079a7d43672a2c37eb4 SHA512 9bba841cb726bfa06888deefacfcee628e36d25de47dd0303d3fd1ce2f07922148d60befe934f44c33fcdfed6ce3dadfb9e3ee0828b66994807178a488051806 WHIRLPOOL f0d258882db85291262c2381aeb6d85ebf20a252344e114a2da35e75f79dc8b73de95b71926512537af17e109fd7a8dd04386d5b3ed610262d42d11bcc1a5707 |
30 |
DIST chromium-53.0.2785.21.tar.xz 460600312 SHA256 68f4a97af24f0c1c964b6633338eab68ead815833b56ea9a9f925a5b3b35baef SHA512 8ccc84506ca47f0d8c77f542b1c0fe7e8f5b8849ce8378ef49a0b7916822bdc622f4e6a4a53b7c5e2b51b68d191e71b6b6757d2258d732103bca507cfc799e90 WHIRLPOOL 30404088b6e8cd572c9c3715ee0ba75c9823e3acea464c956fcd2f7deee2e375eca35ee10cd254b866ecd91e6653ba876893c4d5b810fbd39f9a1caa470217e6 |
31 |
DIST chromium-53.0.2785.34.tar.xz 460739532 SHA256 261ba008c96b335a55feff18785b01484af2d678f85b58206008b31c9e9c372f SHA512 99e0b7a30e34f70ec844ef50f02eadadead2b83f2a47ca7d5779cf0a90bf49e7d3efc1bbc98eb4d1294ed283edd04a993a639003a365e06ae8b2adf26cc1c865 WHIRLPOOL dec533670c1664f88ea32fe253644e479b81fb93bd93f1bc5dbfe41c56979a7642afdfcd041ddf05ca3f0da8e1bedc7ddf48779be3b965038026f65ab199f344 |
32 |
+DIST chromium-54.0.2810.2.tar.xz 460923284 SHA256 f038e72cbd8b7383d13c286329623fda8d6d48f45fa2d964e554b5565283ad71 SHA512 069edcc27427dc7e3c6c3af1932b7d88d2070f8280c9e1881bcba3cbf13bd2d74fe13b79d1e89194c51b9edf71b8ff0f5e45a0a9727798cc723cb8237b95df8c WHIRLPOOL 64b32d5b5c06f9a4d3e774d340da935b92c46bb1573923dfd4f5748af310214ff7295f1b1e101dd6cb50de383e36fd2813087af801bed47df889e69441a6a375 |
33 |
|
34 |
diff --git a/www-client/chromium/chromium-54.0.2810.2.ebuild b/www-client/chromium/chromium-54.0.2810.2.ebuild |
35 |
new file mode 100644 |
36 |
index 0000000..a0e2a3c |
37 |
--- /dev/null |
38 |
+++ b/www-client/chromium/chromium-54.0.2810.2.ebuild |
39 |
@@ -0,0 +1,727 @@ |
40 |
+# Copyright 1999-2016 Gentoo Foundation |
41 |
+# Distributed under the terms of the GNU General Public License v2 |
42 |
+# $Id$ |
43 |
+ |
44 |
+EAPI="6" |
45 |
+PYTHON_COMPAT=( python2_7 ) |
46 |
+ |
47 |
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
48 |
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr |
49 |
+ sv sw ta te th tr uk vi zh-CN zh-TW" |
50 |
+ |
51 |
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils |
52 |
+ |
53 |
+DESCRIPTION="Open-source version of Google Chrome web browser" |
54 |
+HOMEPAGE="http://chromium.org/" |
55 |
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
56 |
+ |
57 |
+LICENSE="BSD" |
58 |
+SLOT="0" |
59 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
60 |
+IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" |
61 |
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
62 |
+ |
63 |
+# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox. |
64 |
+REQUIRED_USE="gn? ( gnome gnome-keyring !tcmalloc )" |
65 |
+ |
66 |
+# Native Client binaries are compiled with different set of flags, bug #452066. |
67 |
+QA_FLAGS_IGNORED=".*\.nexe" |
68 |
+ |
69 |
+# Native Client binaries may be stripped by the build system, which uses the |
70 |
+# right tools for it, bug #469144 . |
71 |
+QA_PRESTRIPPED=".*\.nexe" |
72 |
+ |
73 |
+RDEPEND=" |
74 |
+ app-arch/bzip2:= |
75 |
+ cups? ( >=net-print/cups-1.3.11:= ) |
76 |
+ >=dev-libs/elfutils-0.149 |
77 |
+ dev-libs/expat:= |
78 |
+ dev-libs/glib:= |
79 |
+ >=dev-libs/jsoncpp-0.5.0-r1:= |
80 |
+ dev-libs/nspr:= |
81 |
+ >=dev-libs/nss-3.14.3:= |
82 |
+ gnome? ( >=gnome-base/gconf-2.24.0:= ) |
83 |
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
84 |
+ >=media-libs/alsa-lib-1.0.19:= |
85 |
+ media-libs/fontconfig:= |
86 |
+ media-libs/freetype:= |
87 |
+ media-libs/libexif:= |
88 |
+ media-libs/libpng:= |
89 |
+ media-libs/libvpx:=[svc] |
90 |
+ media-libs/speex:= |
91 |
+ pulseaudio? ( media-sound/pulseaudio:= ) |
92 |
+ system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) |
93 |
+ sys-apps/dbus:= |
94 |
+ sys-apps/pciutils:= |
95 |
+ >=sys-libs/libcap-2.22:= |
96 |
+ virtual/udev |
97 |
+ x11-libs/cairo:= |
98 |
+ x11-libs/gdk-pixbuf:= |
99 |
+ gtk3? ( x11-libs/gtk+:3= ) |
100 |
+ !gtk3? ( x11-libs/gtk+:2= ) |
101 |
+ x11-libs/libdrm |
102 |
+ x11-libs/libX11:= |
103 |
+ x11-libs/libXcomposite:= |
104 |
+ x11-libs/libXcursor:= |
105 |
+ x11-libs/libXdamage:= |
106 |
+ x11-libs/libXext:= |
107 |
+ x11-libs/libXfixes:= |
108 |
+ >=x11-libs/libXi-1.6.0:= |
109 |
+ x11-libs/libXinerama:= |
110 |
+ x11-libs/libXrandr:= |
111 |
+ x11-libs/libXrender:= |
112 |
+ x11-libs/libXScrnSaver:= |
113 |
+ x11-libs/libXtst:= |
114 |
+ x11-libs/pango:= |
115 |
+ kerberos? ( virtual/krb5 ) |
116 |
+ !gn? ( |
117 |
+ >=app-accessibility/speech-dispatcher-0.8:= |
118 |
+ app-arch/snappy:= |
119 |
+ >=dev-libs/libevent-1.4.13:= |
120 |
+ dev-libs/libxml2:=[icu] |
121 |
+ dev-libs/libxslt:= |
122 |
+ media-libs/flac:= |
123 |
+ >=media-libs/harfbuzz-0.9.41:=[icu(+)] |
124 |
+ >=media-libs/libwebp-0.4.0:= |
125 |
+ sys-libs/zlib:=[minizip] |
126 |
+ )" |
127 |
+DEPEND="${RDEPEND} |
128 |
+ >=app-arch/gzip-1.7 |
129 |
+ !arm? ( |
130 |
+ dev-lang/yasm |
131 |
+ ) |
132 |
+ dev-lang/perl |
133 |
+ dev-perl/JSON |
134 |
+ >=dev-util/gperf-3.0.3 |
135 |
+ dev-util/ninja |
136 |
+ sys-apps/hwids[usb(+)] |
137 |
+ >=sys-devel/bison-2.4.3 |
138 |
+ sys-devel/flex |
139 |
+ virtual/pkgconfig" |
140 |
+ |
141 |
+# For nvidia-drivers blocker, see bug #413637 . |
142 |
+RDEPEND+=" |
143 |
+ !=www-client/chromium-9999 |
144 |
+ !<www-plugins/chrome-binary-plugins-37 |
145 |
+ x11-misc/xdg-utils |
146 |
+ virtual/opengl |
147 |
+ virtual/ttf-fonts |
148 |
+ selinux? ( sec-policy/selinux-chromium ) |
149 |
+ tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
150 |
+ widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )" |
151 |
+ |
152 |
+# Python dependencies. The DEPEND part needs to be kept in sync |
153 |
+# with python_check_deps. |
154 |
+DEPEND+=" $(python_gen_any_dep ' |
155 |
+ dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] |
156 |
+ >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] |
157 |
+ dev-python/html5lib[${PYTHON_USEDEP}] |
158 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
159 |
+ dev-python/ply[${PYTHON_USEDEP}] |
160 |
+ dev-python/simplejson[${PYTHON_USEDEP}] |
161 |
+')" |
162 |
+python_check_deps() { |
163 |
+ has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && |
164 |
+ has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && |
165 |
+ has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && |
166 |
+ has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" && |
167 |
+ has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" && |
168 |
+ has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" |
169 |
+} |
170 |
+ |
171 |
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
172 |
+ EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
173 |
+fi |
174 |
+ |
175 |
+DISABLE_AUTOFORMATTING="yes" |
176 |
+DOC_CONTENTS=" |
177 |
+Some web pages may require additional fonts to display properly. |
178 |
+Try installing some of the following packages if some characters |
179 |
+are not displayed properly: |
180 |
+- media-fonts/arphicfonts |
181 |
+- media-fonts/bitstream-cyberbit |
182 |
+- media-fonts/droid |
183 |
+- media-fonts/ipamonafont |
184 |
+- media-fonts/ja-ipafonts |
185 |
+- media-fonts/takao-fonts |
186 |
+- media-fonts/wqy-microhei |
187 |
+- media-fonts/wqy-zenhei |
188 |
+ |
189 |
+Depending on your desktop environment, you may need |
190 |
+to install additional packages to get icons on the Downloads page. |
191 |
+ |
192 |
+For KDE, the required package is kde-frameworks/oxygen-icons. |
193 |
+ |
194 |
+For other desktop environments, try one of the following: |
195 |
+- x11-themes/gnome-icon-theme |
196 |
+- x11-themes/tango-icon-theme |
197 |
+" |
198 |
+ |
199 |
+PATCHES=( |
200 |
+ "${FILESDIR}/${PN}-system-ffmpeg-r3.patch" |
201 |
+ "${FILESDIR}/${PN}-system-jinja-r12.patch" |
202 |
+ "${FILESDIR}/${PN}-widevine-r1.patch" |
203 |
+ "${FILESDIR}/${PN}-last-commit-position-r1.patch" |
204 |
+ "${FILESDIR}/${PN}-gn-r3.patch" |
205 |
+) |
206 |
+ |
207 |
+pkg_pretend() { |
208 |
+ if [[ $(tc-getCC) == *gcc* ]] && \ |
209 |
+ [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then |
210 |
+ die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' |
211 |
+ fi |
212 |
+ |
213 |
+ # Check build requirements, bug #541816 and bug #471810 . |
214 |
+ CHECKREQS_MEMORY="3G" |
215 |
+ CHECKREQS_DISK_BUILD="5G" |
216 |
+ eshopts_push -s extglob |
217 |
+ if is-flagq '-g?(gdb)?([1-9])'; then |
218 |
+ CHECKREQS_DISK_BUILD="25G" |
219 |
+ fi |
220 |
+ eshopts_pop |
221 |
+ check-reqs_pkg_pretend |
222 |
+} |
223 |
+ |
224 |
+pkg_setup() { |
225 |
+ if [[ "${SLOT}" == "0" ]]; then |
226 |
+ CHROMIUM_SUFFIX="" |
227 |
+ else |
228 |
+ CHROMIUM_SUFFIX="-${SLOT}" |
229 |
+ fi |
230 |
+ CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" |
231 |
+ |
232 |
+ # Make sure the build system will use the right python, bug #344367. |
233 |
+ python-any-r1_pkg_setup |
234 |
+ |
235 |
+ chromium_suid_sandbox_check_kernel_config |
236 |
+} |
237 |
+ |
238 |
+src_prepare() { |
239 |
+ default |
240 |
+ |
241 |
+ local conditional_bundled_libraries="" |
242 |
+ if ! use system-ffmpeg; then |
243 |
+ conditional_bundled_libraries+=" third_party/ffmpeg" |
244 |
+ fi |
245 |
+ if use gn; then |
246 |
+ conditional_bundled_libraries+=" |
247 |
+ base/third_party/libevent |
248 |
+ third_party/adobe |
249 |
+ third_party/speech-dispatcher |
250 |
+ third_party/usb_ids |
251 |
+ third_party/xdg-utils |
252 |
+ third_party/yasm/run_yasm.py |
253 |
+ " |
254 |
+ fi |
255 |
+ |
256 |
+ # Remove most bundled libraries. Some are still needed. |
257 |
+ build/linux/unbundle/remove_bundled_libraries.py \ |
258 |
+ ${conditional_bundled_libraries} \ |
259 |
+ 'base/third_party/dmg_fp' \ |
260 |
+ 'base/third_party/dynamic_annotations' \ |
261 |
+ 'base/third_party/icu' \ |
262 |
+ 'base/third_party/nspr' \ |
263 |
+ 'base/third_party/superfasthash' \ |
264 |
+ 'base/third_party/symbolize' \ |
265 |
+ 'base/third_party/valgrind' \ |
266 |
+ 'base/third_party/xdg_mime' \ |
267 |
+ 'base/third_party/xdg_user_dirs' \ |
268 |
+ 'breakpad/src/third_party/curl' \ |
269 |
+ 'chrome/third_party/mozilla_security_manager' \ |
270 |
+ 'courgette/third_party' \ |
271 |
+ 'net/third_party/mozilla_security_manager' \ |
272 |
+ 'net/third_party/nss' \ |
273 |
+ 'third_party/WebKit' \ |
274 |
+ 'third_party/analytics' \ |
275 |
+ 'third_party/angle' \ |
276 |
+ 'third_party/angle/src/common/third_party/numerics' \ |
277 |
+ 'third_party/angle/src/third_party/compiler' \ |
278 |
+ 'third_party/angle/src/third_party/libXNVCtrl' \ |
279 |
+ 'third_party/angle/src/third_party/murmurhash' \ |
280 |
+ 'third_party/angle/src/third_party/trace_event' \ |
281 |
+ 'third_party/boringssl' \ |
282 |
+ 'third_party/brotli' \ |
283 |
+ 'third_party/cacheinvalidation' \ |
284 |
+ 'third_party/catapult' \ |
285 |
+ 'third_party/catapult/third_party/polymer' \ |
286 |
+ 'third_party/catapult/third_party/py_vulcanize' \ |
287 |
+ 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ |
288 |
+ 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ |
289 |
+ 'third_party/catapult/tracing/third_party/d3' \ |
290 |
+ 'third_party/catapult/tracing/third_party/gl-matrix' \ |
291 |
+ 'third_party/catapult/tracing/third_party/jszip' \ |
292 |
+ 'third_party/catapult/tracing/third_party/mannwhitneyu' \ |
293 |
+ 'third_party/ced' \ |
294 |
+ 'third_party/cld_2' \ |
295 |
+ 'third_party/cros_system_api' \ |
296 |
+ 'third_party/cython/python_flags.py' \ |
297 |
+ 'third_party/devscripts' \ |
298 |
+ 'third_party/dom_distiller_js' \ |
299 |
+ 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ |
300 |
+ 'third_party/fips181' \ |
301 |
+ 'third_party/flatbuffers' \ |
302 |
+ 'third_party/flot' \ |
303 |
+ 'third_party/google_input_tools' \ |
304 |
+ 'third_party/google_input_tools/third_party/closure_library' \ |
305 |
+ 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ |
306 |
+ 'third_party/hunspell' \ |
307 |
+ 'third_party/iccjpeg' \ |
308 |
+ 'third_party/icu' \ |
309 |
+ 'third_party/jstemplate' \ |
310 |
+ 'third_party/khronos' \ |
311 |
+ 'third_party/leveldatabase' \ |
312 |
+ 'third_party/libXNVCtrl' \ |
313 |
+ 'third_party/libaddressinput' \ |
314 |
+ 'third_party/libjingle' \ |
315 |
+ 'third_party/libjpeg_turbo' \ |
316 |
+ 'third_party/libphonenumber' \ |
317 |
+ 'third_party/libsecret' \ |
318 |
+ 'third_party/libsrtp' \ |
319 |
+ 'third_party/libudev' \ |
320 |
+ 'third_party/libusb' \ |
321 |
+ 'third_party/libwebm' \ |
322 |
+ 'third_party/libxml/chromium' \ |
323 |
+ 'third_party/libyuv' \ |
324 |
+ 'third_party/lss' \ |
325 |
+ 'third_party/lzma_sdk' \ |
326 |
+ 'third_party/mesa' \ |
327 |
+ 'third_party/modp_b64' \ |
328 |
+ 'third_party/mt19937ar' \ |
329 |
+ 'third_party/openh264' \ |
330 |
+ 'third_party/openmax_dl' \ |
331 |
+ 'third_party/opus' \ |
332 |
+ 'third_party/ots' \ |
333 |
+ 'third_party/pdfium' \ |
334 |
+ 'third_party/pdfium/third_party/agg23' \ |
335 |
+ 'third_party/pdfium/third_party/base' \ |
336 |
+ 'third_party/pdfium/third_party/bigint' \ |
337 |
+ 'third_party/pdfium/third_party/freetype' \ |
338 |
+ 'third_party/pdfium/third_party/lcms2-2.6' \ |
339 |
+ 'third_party/pdfium/third_party/libjpeg' \ |
340 |
+ 'third_party/pdfium/third_party/libopenjpeg20' \ |
341 |
+ 'third_party/pdfium/third_party/libpng16' \ |
342 |
+ 'third_party/pdfium/third_party/libtiff' \ |
343 |
+ 'third_party/pdfium/third_party/zlib_v128' \ |
344 |
+ 'third_party/polymer' \ |
345 |
+ 'third_party/protobuf' \ |
346 |
+ 'third_party/protobuf/third_party/six' \ |
347 |
+ 'third_party/qcms' \ |
348 |
+ 'third_party/re2' \ |
349 |
+ 'third_party/sfntly' \ |
350 |
+ 'third_party/skia' \ |
351 |
+ 'third_party/smhasher' \ |
352 |
+ 'third_party/sqlite' \ |
353 |
+ 'third_party/tcmalloc' \ |
354 |
+ 'third_party/usrsctp' \ |
355 |
+ 'third_party/web-animations-js' \ |
356 |
+ 'third_party/webdriver' \ |
357 |
+ 'third_party/webrtc' \ |
358 |
+ 'third_party/widevine' \ |
359 |
+ 'third_party/woff2' \ |
360 |
+ 'third_party/x86inc' \ |
361 |
+ 'third_party/zlib/google' \ |
362 |
+ 'url/third_party/mozilla' \ |
363 |
+ 'v8/src/third_party/valgrind' \ |
364 |
+ --do-remove || die |
365 |
+} |
366 |
+ |
367 |
+src_configure() { |
368 |
+ local myconf_gyp="" |
369 |
+ local myconf_gn="" |
370 |
+ |
371 |
+ # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
372 |
+ myconf_gn+=" is_debug=false" |
373 |
+ |
374 |
+ # Never tell the build system to "enable" SSE2, it has a few unexpected |
375 |
+ # additions, bug #336871. |
376 |
+ myconf_gyp+=" -Ddisable_sse2=1" |
377 |
+ |
378 |
+ # Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
379 |
+ myconf_gyp+=" -Ddisable_nacl=1" |
380 |
+ myconf_gn+=" enable_nacl=false" |
381 |
+ |
382 |
+ # Make it possible to remove third_party/adobe. |
383 |
+ echo > "${T}/flapper_version.h" || die |
384 |
+ myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h" |
385 |
+ |
386 |
+ # Use system-provided libraries. |
387 |
+ # TODO: use_system_hunspell (upstream changes needed). |
388 |
+ # TODO: use_system_icu (bug #576370). |
389 |
+ # TODO: use_system_libjpeg (bug #584518). |
390 |
+ # TODO: use_system_libsrtp (bug #459932). |
391 |
+ # TODO: use_system_libusb (http://crbug.com/266149). |
392 |
+ # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). |
393 |
+ # TODO: use_system_protobuf (bug #525560). |
394 |
+ # TODO: use_system_re2 (bug #571156). |
395 |
+ # TODO: use_system_ssl (http://crbug.com/58087). |
396 |
+ # TODO: use_system_sqlite (http://crbug.com/22208). |
397 |
+ myconf_gyp+=" |
398 |
+ -Duse_system_bzip2=1 |
399 |
+ -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) |
400 |
+ -Duse_system_flac=1 |
401 |
+ -Duse_system_harfbuzz=1 |
402 |
+ -Duse_system_jsoncpp=1 |
403 |
+ -Duse_system_libevent=1 |
404 |
+ -Duse_system_libpng=1 |
405 |
+ -Duse_system_libvpx=1 |
406 |
+ -Duse_system_libwebp=1 |
407 |
+ -Duse_system_libxml=1 |
408 |
+ -Duse_system_libxslt=1 |
409 |
+ -Duse_system_minizip=1 |
410 |
+ -Duse_system_nspr=1 |
411 |
+ -Duse_system_snappy=1 |
412 |
+ -Duse_system_speex=1 |
413 |
+ -Duse_system_xdg_utils=1 |
414 |
+ -Duse_system_zlib=1" |
415 |
+ |
416 |
+ local gn_system_libraries=" |
417 |
+ flac |
418 |
+ harfbuzz-ng |
419 |
+ libevent |
420 |
+ libpng |
421 |
+ libvpx |
422 |
+ libwebp |
423 |
+ libxml |
424 |
+ libxslt |
425 |
+ snappy |
426 |
+ yasm |
427 |
+ zlib" |
428 |
+ if use system-ffmpeg; then |
429 |
+ gn_system_libraries+=" ffmpeg" |
430 |
+ fi |
431 |
+ build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die |
432 |
+ |
433 |
+ # Needed for system icu - we don't need additional data files. |
434 |
+ # myconf_gyp+=" -Dicu_use_data_file_flag=0" |
435 |
+ |
436 |
+ # TODO: patch gyp so that this arm conditional is not needed. |
437 |
+ if ! use arm; then |
438 |
+ myconf_gyp+=" |
439 |
+ -Duse_system_yasm=1" |
440 |
+ fi |
441 |
+ |
442 |
+ # Optional dependencies. |
443 |
+ # TODO: linux_link_kerberos, bug #381289. |
444 |
+ myconf_gyp+=" |
445 |
+ $(gyp_use cups) |
446 |
+ $(gyp_use gnome use_gconf) |
447 |
+ $(gyp_use gnome-keyring use_gnome_keyring) |
448 |
+ $(gyp_use gnome-keyring linux_link_gnome_keyring) |
449 |
+ $(gyp_use gtk3) |
450 |
+ $(gyp_use hangouts enable_hangout_services_extension) |
451 |
+ $(gyp_use kerberos) |
452 |
+ $(gyp_use pulseaudio) |
453 |
+ $(gyp_use tcmalloc use_allocator tcmalloc none) |
454 |
+ $(gyp_use widevine enable_widevine)" |
455 |
+ |
456 |
+ # TODO: support USE=gnome-keyring for GN |
457 |
+ myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
458 |
+ myconf_gn+=" enable_widevine=$(usex widevine true false)" |
459 |
+ myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
460 |
+ myconf_gn+=" use_cups=$(usex cups true false)" |
461 |
+ myconf_gn+=" use_gconf=$(usex gnome true false)" |
462 |
+ myconf_gn+=" use_gtk3=$(usex gtk3 true false)" |
463 |
+ myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
464 |
+ myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
465 |
+ |
466 |
+ # Use explicit library dependencies instead of dlopen. |
467 |
+ # This makes breakages easier to detect by revdep-rebuild. |
468 |
+ myconf_gyp+=" |
469 |
+ -Dlinux_link_gsettings=1 |
470 |
+ -Dlinux_link_libpci=1 |
471 |
+ -Dlinux_link_libspeechd=1 |
472 |
+ -Dlibspeechd_h_prefix=speech-dispatcher/" |
473 |
+ |
474 |
+ # TODO: link_pulseaudio=true for GN. |
475 |
+ |
476 |
+ # TODO: use the file at run time instead of effectively compiling it in. |
477 |
+ myconf_gyp+=" |
478 |
+ -Dusb_ids_path=/usr/share/misc/usb.ids" |
479 |
+ |
480 |
+ myconf_gyp+=" -Dfieldtrial_testing_like_official_build=1" |
481 |
+ myconf_gn+=" fieldtrial_testing_like_official_build=true" |
482 |
+ |
483 |
+ if [[ $(tc-getCC) == *clang* ]]; then |
484 |
+ myconf_gyp+=" -Dclang=1" |
485 |
+ myconf_gn+=" is_clang=true" |
486 |
+ else |
487 |
+ myconf_gyp+=" -Dclang=0" |
488 |
+ myconf_gn+=" is_clang=false" |
489 |
+ fi |
490 |
+ |
491 |
+ # Never use bundled gold binary. Disable gold linker flags for now. |
492 |
+ # Do not use bundled clang. |
493 |
+ myconf_gyp+=" |
494 |
+ -Dclang_use_chrome_plugins=0 |
495 |
+ -Dhost_clang=0 |
496 |
+ -Dlinux_use_bundled_binutils=0 |
497 |
+ -Dlinux_use_bundled_gold=0 |
498 |
+ -Dlinux_use_gold_flags=0 |
499 |
+ -Dsysroot=" |
500 |
+ # Trying to use gold results in linker crash. |
501 |
+ myconf_gn+=" use_gold=false use_sysroot=false" |
502 |
+ |
503 |
+ ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
504 |
+ myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" |
505 |
+ myconf_gn+=" proprietary_codecs=true ffmpeg_branding=\"${ffmpeg_branding}\"" |
506 |
+ |
507 |
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
508 |
+ # Note: these are for Gentoo use ONLY. For your own distribution, |
509 |
+ # please get your own set of keys. Feel free to contact chromium@g.o |
510 |
+ # for more info. |
511 |
+ local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" |
512 |
+ local google_default_client_id="329227923882.apps.googleusercontent.com" |
513 |
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
514 |
+ myconf_gyp+=" -Dgoogle_api_key=${google_api_key} |
515 |
+ -Dgoogle_default_client_id=${google_default_client_id} |
516 |
+ -Dgoogle_default_client_secret=${google_default_client_secret}" |
517 |
+ myconf_gn+=" google_api_key=\"${google_api_key}\"" |
518 |
+ myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" |
519 |
+ myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
520 |
+ |
521 |
+ local myarch="$(tc-arch)" |
522 |
+ if [[ $myarch = amd64 ]] ; then |
523 |
+ target_arch=x64 |
524 |
+ ffmpeg_target_arch=x64 |
525 |
+ elif [[ $myarch = x86 ]] ; then |
526 |
+ target_arch=ia32 |
527 |
+ ffmpeg_target_arch=ia32 |
528 |
+ elif [[ $myarch = arm64 ]] ; then |
529 |
+ target_arch=arm64 |
530 |
+ ffmpeg_target_arch=arm64 |
531 |
+ elif [[ $myarch = arm ]] ; then |
532 |
+ target_arch=arm |
533 |
+ ffmpeg_target_arch=$(usex neon arm-neon arm) |
534 |
+ # TODO: re-enable NaCl (NativeClient). |
535 |
+ local CTARGET=${CTARGET:-${CHOST}} |
536 |
+ if [[ $(tc-is-softfloat) == "no" ]]; then |
537 |
+ |
538 |
+ myconf_gyp+=" -Darm_float_abi=hard" |
539 |
+ fi |
540 |
+ filter-flags "-mfpu=*" |
541 |
+ use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" |
542 |
+ |
543 |
+ if [[ ${CTARGET} == armv[78]* ]]; then |
544 |
+ myconf_gyp+=" -Darmv7=1" |
545 |
+ else |
546 |
+ myconf_gyp+=" -Darmv7=0" |
547 |
+ fi |
548 |
+ myconf_gyp+=" -Dsysroot= |
549 |
+ $(gyp_use neon arm_neon) |
550 |
+ -Ddisable_nacl=1" |
551 |
+ else |
552 |
+ die "Failed to determine target arch, got '$myarch'." |
553 |
+ fi |
554 |
+ |
555 |
+ myconf_gyp+=" -Dtarget_arch=${target_arch}" |
556 |
+ |
557 |
+ # Make sure that -Werror doesn't get added to CFLAGS by the build system. |
558 |
+ # Depending on GCC version the warnings are different and we don't want |
559 |
+ # the build to fail because of that. |
560 |
+ myconf_gyp+=" -Dwerror=" |
561 |
+ myconf_gn+=" treat_warnings_as_errors=false" |
562 |
+ |
563 |
+ # Disable fatal linker warnings, bug 506268. |
564 |
+ myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" |
565 |
+ myconf_gn+=" fatal_linker_warnings=false" |
566 |
+ |
567 |
+ # Avoid CFLAGS problems, bug #352457, bug #390147. |
568 |
+ if ! use custom-cflags; then |
569 |
+ replace-flags "-Os" "-O2" |
570 |
+ strip-flags |
571 |
+ |
572 |
+ # Prevent linker from running out of address space, bug #471810 . |
573 |
+ if use x86; then |
574 |
+ filter-flags "-g*" |
575 |
+ fi |
576 |
+ |
577 |
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
578 |
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
579 |
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
580 |
+ fi |
581 |
+ fi |
582 |
+ |
583 |
+ # Make sure the build system will use the right tools, bug #340795. |
584 |
+ tc-export AR CC CXX NM |
585 |
+ |
586 |
+ # Tools for building programs to be executed on the build system, bug #410883. |
587 |
+ if tc-is-cross-compiler; then |
588 |
+ export AR_host=$(tc-getBUILD_AR) |
589 |
+ export CC_host=$(tc-getBUILD_CC) |
590 |
+ export CXX_host=$(tc-getBUILD_CXX) |
591 |
+ export NM_host=$(tc-getBUILD_NM) |
592 |
+ fi |
593 |
+ |
594 |
+ # Bug 491582. |
595 |
+ export TMPDIR="${WORKDIR}/temp" |
596 |
+ mkdir -p -m 755 "${TMPDIR}" || die |
597 |
+ |
598 |
+ if ! use system-ffmpeg; then |
599 |
+ local build_ffmpeg_args="" |
600 |
+ if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
601 |
+ build_ffmpeg_args+=" --disable-asm" |
602 |
+ fi |
603 |
+ |
604 |
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
605 |
+ einfo "Configuring bundled ffmpeg..." |
606 |
+ pushd third_party/ffmpeg > /dev/null || die |
607 |
+ chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
608 |
+ --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
609 |
+ chromium/scripts/copy_config.sh || die |
610 |
+ chromium/scripts/generate_gyp.py || die |
611 |
+ popd > /dev/null || die |
612 |
+ fi |
613 |
+ |
614 |
+ third_party/libaddressinput/chromium/tools/update-strings.py || die |
615 |
+ |
616 |
+ touch chrome/test/data/webui/i18n_process_css_test.html || die |
617 |
+ |
618 |
+ einfo "Configuring Chromium..." |
619 |
+ if use gn; then |
620 |
+ tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die |
621 |
+ out/Release/gn gen --args="${myconf_gn}" out/Release || die |
622 |
+ else |
623 |
+ build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die |
624 |
+ egyp_chromium ${myconf_gyp} || die |
625 |
+ fi |
626 |
+} |
627 |
+ |
628 |
+eninja() { |
629 |
+ if [[ -z ${NINJAOPTS+set} ]]; then |
630 |
+ local jobs=$(makeopts_jobs) |
631 |
+ local loadavg=$(makeopts_loadavg) |
632 |
+ |
633 |
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then |
634 |
+ NINJAOPTS+=" -j ${jobs}" |
635 |
+ fi |
636 |
+ if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then |
637 |
+ NINJAOPTS+=" -l ${loadavg}" |
638 |
+ fi |
639 |
+ fi |
640 |
+ set -- ninja -v ${NINJAOPTS} "$@" |
641 |
+ echo "$@" |
642 |
+ "$@" |
643 |
+} |
644 |
+ |
645 |
+src_compile() { |
646 |
+ local ninja_targets="chrome chrome_sandbox chromedriver" |
647 |
+ |
648 |
+ # Build mksnapshot and pax-mark it. |
649 |
+ eninja -C out/Release mksnapshot || die |
650 |
+ pax-mark m out/Release/mksnapshot |
651 |
+ |
652 |
+ # Even though ninja autodetects number of CPUs, we respect |
653 |
+ # user's options, for debugging with -j 1 or any other reason. |
654 |
+ eninja -C out/Release ${ninja_targets} || die |
655 |
+ |
656 |
+ pax-mark m out/Release/chrome |
657 |
+} |
658 |
+ |
659 |
+src_install() { |
660 |
+ exeinto "${CHROMIUM_HOME}" |
661 |
+ doexe out/Release/chrome || die |
662 |
+ |
663 |
+ newexe out/Release/chrome_sandbox chrome-sandbox || die |
664 |
+ fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" |
665 |
+ |
666 |
+ doexe out/Release/chromedriver || die |
667 |
+ use widevine && doexe out/Release/libwidevinecdmadapter.so |
668 |
+ |
669 |
+ # if ! use arm; then |
670 |
+ # doexe out/Release/nacl_helper{,_bootstrap} || die |
671 |
+ # insinto "${CHROMIUM_HOME}" |
672 |
+ # doins out/Release/nacl_irt_*.nexe || die |
673 |
+ # doins out/Release/libppGoogleNaClPluginChrome.so || die |
674 |
+ # fi |
675 |
+ |
676 |
+ local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) |
677 |
+ if [[ -n ${CHROMIUM_SUFFIX} ]]; then |
678 |
+ sedargs+=( |
679 |
+ -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" |
680 |
+ -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" |
681 |
+ -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" |
682 |
+ ) |
683 |
+ fi |
684 |
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die |
685 |
+ doexe chromium-launcher.sh |
686 |
+ |
687 |
+ # It is important that we name the target "chromium-browser", |
688 |
+ # xdg-utils expect it; bug #355517. |
689 |
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die |
690 |
+ # keep the old symlink around for consistency |
691 |
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die |
692 |
+ |
693 |
+ dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die |
694 |
+ |
695 |
+ # Allow users to override command-line options, bug #357629. |
696 |
+ dodir /etc/chromium || die |
697 |
+ insinto /etc/chromium |
698 |
+ newins "${FILESDIR}/chromium.default" "default" || die |
699 |
+ |
700 |
+ pushd out/Release/locales > /dev/null || die |
701 |
+ chromium_remove_language_paks |
702 |
+ popd |
703 |
+ |
704 |
+ insinto "${CHROMIUM_HOME}" |
705 |
+ doins out/Release/*.bin || die |
706 |
+ doins out/Release/*.pak || die |
707 |
+ |
708 |
+ doins out/Release/icudtl.dat || die |
709 |
+ |
710 |
+ doins -r out/Release/locales || die |
711 |
+ doins -r out/Release/resources || die |
712 |
+ |
713 |
+ newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die |
714 |
+ newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die |
715 |
+ |
716 |
+ # Install icons and desktop entry. |
717 |
+ local branding size |
718 |
+ for size in 16 22 24 32 48 64 128 256 ; do |
719 |
+ case ${size} in |
720 |
+ 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; |
721 |
+ *) branding="chrome/app/theme/chromium" ;; |
722 |
+ esac |
723 |
+ newicon -s ${size} "${branding}/product_logo_${size}.png" \ |
724 |
+ chromium-browser${CHROMIUM_SUFFIX}.png |
725 |
+ done |
726 |
+ |
727 |
+ local mime_types="text/html;text/xml;application/xhtml+xml;" |
728 |
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
729 |
+ mime_types+="x-scheme-handler/ftp;" # bug #412185 |
730 |
+ mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 |
731 |
+ make_desktop_entry \ |
732 |
+ chromium-browser${CHROMIUM_SUFFIX} \ |
733 |
+ "Chromium${CHROMIUM_SUFFIX}" \ |
734 |
+ chromium-browser${CHROMIUM_SUFFIX} \ |
735 |
+ "Network;WebBrowser" \ |
736 |
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
737 |
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
738 |
+ |
739 |
+ # Install GNOME default application entry (bug #303100). |
740 |
+ if use gnome; then |
741 |
+ dodir /usr/share/gnome-control-center/default-apps || die |
742 |
+ insinto /usr/share/gnome-control-center/default-apps |
743 |
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die |
744 |
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then |
745 |
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ |
746 |
+ "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml |
747 |
+ fi |
748 |
+ fi |
749 |
+ |
750 |
+ readme.gentoo_create_doc |
751 |
+} |
752 |
+ |
753 |
+pkg_preinst() { |
754 |
+ gnome2_icon_savelist |
755 |
+} |
756 |
+ |
757 |
+pkg_postrm() { |
758 |
+ gnome2_icon_cache_update |
759 |
+ xdg_desktop_database_update |
760 |
+} |
761 |
+ |
762 |
+pkg_postinst() { |
763 |
+ gnome2_icon_cache_update |
764 |
+ xdg_desktop_database_update |
765 |
+ readme.gentoo_print_elog |
766 |
+} |
767 |
|
768 |
diff --git a/www-client/chromium/files/chromium-gn-r3.patch b/www-client/chromium/files/chromium-gn-r3.patch |
769 |
new file mode 100644 |
770 |
index 0000000..b29a6ae |
771 |
--- /dev/null |
772 |
+++ b/www-client/chromium/files/chromium-gn-r3.patch |
773 |
@@ -0,0 +1,21 @@ |
774 |
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py |
775 |
+index 9a3740e8..fa81d10 100755 |
776 |
+--- a/tools/gn/bootstrap/bootstrap.py |
777 |
++++ b/tools/gn/bootstrap/bootstrap.py |
778 |
+@@ -427,6 +427,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
779 |
+ 'base/profiler/scoped_tracker.cc', |
780 |
+ 'base/profiler/tracked_time.cc', |
781 |
+ 'base/run_loop.cc', |
782 |
++ 'base/sequence_token.cc', |
783 |
+ 'base/sequence_checker_impl.cc', |
784 |
+ 'base/sequenced_task_runner.cc', |
785 |
+ 'base/sha1.cc', |
786 |
+@@ -439,7 +440,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
787 |
+ 'base/strings/stringprintf.cc', |
788 |
+ 'base/strings/utf_string_conversion_utils.cc', |
789 |
+ 'base/strings/utf_string_conversions.cc', |
790 |
+- 'base/synchronization/cancellation_flag.cc', |
791 |
++ 'base/synchronization/atomic_flag.cc', |
792 |
+ 'base/synchronization/lock.cc', |
793 |
+ 'base/sys_info.cc', |
794 |
+ 'base/task_runner.cc', |
795 |
|
796 |
diff --git a/www-client/chromium/files/chromium-last-commit-position-r1.patch b/www-client/chromium/files/chromium-last-commit-position-r1.patch |
797 |
new file mode 100644 |
798 |
index 0000000..700a86e |
799 |
--- /dev/null |
800 |
+++ b/www-client/chromium/files/chromium-last-commit-position-r1.patch |
801 |
@@ -0,0 +1,26 @@ |
802 |
+--- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000 |
803 |
++++ b/tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000 |
804 |
+@@ -11,13 +11,7 @@ |
805 |
+ #include "tools/gn/standard_out.h" |
806 |
+ #include "tools/gn/switches.h" |
807 |
+ |
808 |
+-// Only the GN-generated build makes this header for now. |
809 |
+-// TODO(brettw) consider adding this if we need it in GYP. |
810 |
+-#if defined(GN_BUILD) |
811 |
+-#include "tools/gn/last_commit_position.h" |
812 |
+-#else |
813 |
+ #define LAST_COMMIT_POSITION "UNKNOWN" |
814 |
+-#endif |
815 |
+ |
816 |
+ namespace { |
817 |
+ |
818 |
+--- a/tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000 |
819 |
++++ b/tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000 |
820 |
+@@ -227,7 +227,6 @@ |
821 |
+ |
822 |
+ deps = [ |
823 |
+ ":gn_lib", |
824 |
+- ":last_commit_position", |
825 |
+ "//base", |
826 |
+ "//build/config/sanitizers:deps", |
827 |
+ ] |
828 |
|
829 |
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch |
830 |
index 8be1735..023dd26 100644 |
831 |
--- a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch |
832 |
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch |
833 |
@@ -19,14 +19,12 @@ |
834 |
#include <libavformat/avio.h> |
835 |
#include <libavutil/avutil.h> |
836 |
#include <libavutil/imgutils.h> |
837 |
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
838 |
-index 155e980..7ba327a 100644 |
839 |
---- a/media/filters/ffmpeg_demuxer.cc |
840 |
-+++ b/media/filters/ffmpeg_demuxer.cc |
841 |
-@@ -1034,24 +1034,6 @@ |
842 |
- // If no estimate is found, the stream entry will be kInfiniteDuration(). |
843 |
+--- a/media/filters/ffmpeg_demuxer.cc.orig 2016-08-01 10:52:01.528177808 +0000 |
844 |
++++ b/media/filters/ffmpeg_demuxer.cc 2016-08-01 10:52:27.160707694 +0000 |
845 |
+@@ -1150,24 +1150,6 @@ |
846 |
+ // If no estimate is found, the stream entry will be kInfiniteDuration. |
847 |
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, |
848 |
- kInfiniteDuration()); |
849 |
+ kInfiniteDuration); |
850 |
- const AVFormatInternal* internal = format_context->internal; |
851 |
- if (internal && internal->packet_buffer && |
852 |
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { |
853 |
@@ -46,28 +44,5 @@ index 155e980..7ba327a 100644 |
854 |
- } |
855 |
- } |
856 |
|
857 |
+ std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); |
858 |
AVStream* audio_stream = NULL; |
859 |
- AudioDecoderConfig audio_config; |
860 |
-Index: build/linux/unbundle/ffmpeg.gyp |
861 |
-diff --git a/build/linux/unbundle/ffmpeg.gyp b/build/linux/unbundle/ffmpeg.gyp |
862 |
-index e3c3723894ceae651920154dbb65cf83aa4d3d40..b86a1c4dc71c55d86a0bb66664f27cfe4f243fbc 100644 |
863 |
---- a/build/linux/unbundle/ffmpeg.gyp |
864 |
-+++ b/build/linux/unbundle/ffmpeg.gyp |
865 |
-@@ -41,6 +41,17 @@ |
866 |
- 'USE_SYSTEM_FFMPEG', |
867 |
- ], |
868 |
- }, |
869 |
-+ 'variables': { |
870 |
-+ 'headers_root_path': '.', |
871 |
-+ 'header_filenames': [ |
872 |
-+ 'libavcodec/avcodec.h', |
873 |
-+ 'libavformat/avformat.h', |
874 |
-+ 'libavutil/imgutils.h', |
875 |
-+ ], |
876 |
-+ }, |
877 |
-+ 'includes': [ |
878 |
-+ '../../build/shim_headers.gypi', |
879 |
-+ ], |
880 |
- 'link_settings': { |
881 |
- 'ldflags': [ |
882 |
- '<!@(pkg-config --libs-only-L --libs-only-other libavcodec libavformat libavutil)', |
883 |
|
884 |
diff --git a/www-client/chromium/files/chromium-system-jinja-r12.patch b/www-client/chromium/files/chromium-system-jinja-r12.patch |
885 |
new file mode 100644 |
886 |
index 0000000..869cef9 |
887 |
--- /dev/null |
888 |
+++ b/www-client/chromium/files/chromium-system-jinja-r12.patch |
889 |
@@ -0,0 +1,79 @@ |
890 |
+--- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000 |
891 |
++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000 |
892 |
+@@ -54,7 +54,6 @@ |
893 |
+ 'actions': [{ |
894 |
+ 'action_name': 'cache_jinja_templates', |
895 |
+ 'inputs': [ |
896 |
+- '<@(jinja_module_files)', |
897 |
+ 'code_generator_v8.py', |
898 |
+ '<@(code_generator_template_files)', |
899 |
+ ], |
900 |
+--- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000 |
901 |
++++ b/third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000 |
902 |
+@@ -2,10 +2,6 @@ |
903 |
+ { |
904 |
+ 'variables': { |
905 |
+ 'scripts_for_in_files': [ |
906 |
+- # jinja2/__init__.py contains version string, so sufficient as |
907 |
+- # dependency for whole jinja2 package |
908 |
+- '<(DEPTH)/third_party/jinja2/__init__.py', |
909 |
+- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep |
910 |
+ 'hasher.py', |
911 |
+ 'in_file.py', |
912 |
+ 'in_generator.py', |
913 |
+--- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000 |
914 |
++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000 |
915 |
+@@ -12,9 +12,6 @@ |
916 |
+ '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep |
917 |
+ ], |
918 |
+ 'idl_lexer_parser_files': [ |
919 |
+- # PLY (Python Lex-Yacc) |
920 |
+- '<(DEPTH)/third_party/ply/lex.py', |
921 |
+- '<(DEPTH)/third_party/ply/yacc.py', |
922 |
+ # Web IDL lexer/parser (base parser) |
923 |
+ '<(DEPTH)/tools/idl_parser/idl_lexer.py', |
924 |
+ '<(DEPTH)/tools/idl_parser/idl_node.py', |
925 |
+--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000 |
926 |
++++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000 |
927 |
+@@ -9,10 +9,6 @@ |
928 |
+ _scripts_dir = "//third_party/WebKit/Source/build/scripts" |
929 |
+ |
930 |
+ scripts_for_in_files = [ |
931 |
+- # jinja2/__init__.py contains version string, so sufficient as |
932 |
+- # dependency for whole jinja2 package |
933 |
+- "//third_party/jinja2/__init__.py", |
934 |
+- "//third_party/markupsafe/__init__.py", # jinja2 dep |
935 |
+ "$_scripts_dir/hasher.py", |
936 |
+ "$_scripts_dir/in_file.py", |
937 |
+ "$_scripts_dir/in_generator.py", |
938 |
+--- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000 |
939 |
++++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000 |
940 |
+@@ -36,7 +36,7 @@ |
941 |
+ action("cached_jinja_templates") { |
942 |
+ script = "code_generator_v8.py" |
943 |
+ |
944 |
+- inputs = jinja_module_files + [ "code_generator_v8.py" ] + |
945 |
++ inputs = [ "code_generator_v8.py" ] + |
946 |
+ code_generator_template_files |
947 |
+ |
948 |
+ # Dummy file to track dependency. |
949 |
+--- a/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig 2016-06-03 12:31:49.844954196 +0000 |
950 |
++++ b/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp 2016-06-03 12:32:01.869198425 +0000 |
951 |
+@@ -60,7 +60,6 @@ |
952 |
+ { |
953 |
+ 'action_name': 'generateV8InspectorProtocolBackendSources', |
954 |
+ 'inputs': [ |
955 |
+- '<@(jinja_module_files)', |
956 |
+ # The python script in action below. |
957 |
+ '../inspector_protocol/CodeGenerator.py', |
958 |
+ # Input files for the script. |
959 |
+--- a/third_party/WebKit/Source/core/inspector/inspector.gyp.orig 2016-06-03 12:38:20.712891692 +0000 |
960 |
++++ b/third_party/WebKit/Source/core/inspector/inspector.gyp 2016-06-03 12:38:31.197104557 +0000 |
961 |
+@@ -52,7 +52,6 @@ |
962 |
+ { |
963 |
+ 'action_name': 'generateInspectorProtocolBackendSources', |
964 |
+ 'inputs': [ |
965 |
+- '<@(jinja_module_files)', |
966 |
+ # The python script in action below. |
967 |
+ '../../platform/inspector_protocol/CodeGenerator.py', |
968 |
+ # Input files for the script. |