1 |
phajdan.jr 13/03/01 18:01:14 |
2 |
|
3 |
Modified: ChangeLog chromium-9999-r1.ebuild |
4 |
Added: chromium-27.0.1425.0.ebuild |
5 |
Log: |
6 |
Dev channel bump. Back to system libvpx. |
7 |
|
8 |
(Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 30427902) |
9 |
|
10 |
Revision Changes Path |
11 |
1.822 www-client/chromium/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.822&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.822&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.821&r2=1.822 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
20 |
retrieving revision 1.821 |
21 |
retrieving revision 1.822 |
22 |
diff -u -r1.821 -r1.822 |
23 |
--- ChangeLog 1 Mar 2013 03:30:15 -0000 1.821 |
24 |
+++ ChangeLog 1 Mar 2013 18:01:14 -0000 1.822 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for www-client/chromium |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.821 2013/03/01 03:30:15 floppym Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.822 2013/03/01 18:01:14 phajdan.jr Exp $ |
30 |
+ |
31 |
+*chromium-27.0.1425.0 (01 Mar 2013) |
32 |
+ |
33 |
+ 01 Mar 2013; Pawel Hajdan jr <phajdan.jr@g.o> |
34 |
+ +chromium-27.0.1425.0.ebuild, chromium-9999-r1.ebuild: |
35 |
+ Dev channel bump. Back to system libvpx. |
36 |
|
37 |
01 Mar 2013; Mike Gilbert <floppym@g.o> chromium-26.0.1410.19.ebuild: |
38 |
Disable SecurityTest.CallocOverflow for M26, bug 458396. |
39 |
|
40 |
|
41 |
|
42 |
1.174 www-client/chromium/chromium-9999-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.174&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.174&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.173&r2=1.174 |
47 |
|
48 |
Index: chromium-9999-r1.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v |
51 |
retrieving revision 1.173 |
52 |
retrieving revision 1.174 |
53 |
diff -u -r1.173 -r1.174 |
54 |
--- chromium-9999-r1.ebuild 1 Mar 2013 02:15:33 -0000 1.173 |
55 |
+++ chromium-9999-r1.ebuild 1 Mar 2013 18:01:14 -0000 1.174 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2013 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.173 2013/03/01 02:15:33 floppym Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.174 2013/03/01 18:01:14 phajdan.jr Exp $ |
61 |
|
62 |
EAPI="5" |
63 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
64 |
@@ -34,7 +34,7 @@ |
65 |
>=dev-libs/elfutils-0.149 |
66 |
dev-libs/expat |
67 |
>=dev-libs/icu-49.1.1-r1:= |
68 |
- dev-libs/jsoncpp |
69 |
+ >=dev-libs/jsoncpp-0.5.0-r1 |
70 |
>=dev-libs/libevent-1.4.13 |
71 |
dev-libs/libxml2[icu] |
72 |
dev-libs/libxslt |
73 |
@@ -50,6 +50,7 @@ |
74 |
media-libs/harfbuzz |
75 |
>=media-libs/libjpeg-turbo-1.2.0-r1 |
76 |
media-libs/libpng |
77 |
+ media-libs/libvpx |
78 |
>=media-libs/libwebp-0.2.0_rc1 |
79 |
!arm? ( !x86? ( media-libs/mesa[gles2] ) ) |
80 |
media-libs/opus |
81 |
@@ -188,7 +189,7 @@ |
82 |
# Fix build without NaCl glibc toolchain. |
83 |
epatch "${FILESDIR}/${PN}-ppapi-r0.patch" |
84 |
|
85 |
- epatch "${FILESDIR}/${PN}-system-ffmpeg-r3.patch" |
86 |
+ epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" |
87 |
|
88 |
epatch_user |
89 |
|
90 |
@@ -209,7 +210,6 @@ |
91 |
\! -path 'third_party/leveldatabase/*' \ |
92 |
\! -path 'third_party/libjingle/*' \ |
93 |
\! -path 'third_party/libphonenumber/*' \ |
94 |
- \! -path 'third_party/libvpx/*' \ |
95 |
\! -path 'third_party/libxml/chromium/*' \ |
96 |
\! -path 'third_party/libXNVCtrl/*' \ |
97 |
\! -path 'third_party/libyuv/*' \ |
98 |
@@ -275,7 +275,6 @@ |
99 |
# TODO: use_system_hunspell (upstream changes needed). |
100 |
# TODO: use_system_ssl (http://crbug.com/58087). |
101 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
102 |
- # TODO: use_system_libvpx (http://crbug.com/174287). |
103 |
myconf+=" |
104 |
-Duse_system_bzip2=1 |
105 |
-Duse_system_flac=1 |
106 |
@@ -287,6 +286,7 @@ |
107 |
-Duse_system_libpng=1 |
108 |
-Duse_system_libsrtp=1 |
109 |
-Duse_system_libusb=1 |
110 |
+ -Duse_system_libvpx=1 |
111 |
-Duse_system_libwebp=1 |
112 |
-Duse_system_libxml=1 |
113 |
-Duse_system_minizip=1 |
114 |
@@ -312,6 +312,10 @@ |
115 |
-Duse_system_yasm=1" |
116 |
fi |
117 |
|
118 |
+ # TODO: re-enable on vp9 libvpx release (http://crbug.com/174287). |
119 |
+ myconf+=" |
120 |
+ -Dmedia_use_libvpx=0" |
121 |
+ |
122 |
# Optional dependencies. |
123 |
# TODO: linux_link_kerberos, bug #381289. |
124 |
myconf+=" |
125 |
@@ -403,7 +407,7 @@ |
126 |
src_compile() { |
127 |
local test_targets |
128 |
for x in base cacheinvalidation crypto \ |
129 |
- googleurl gpu media net printing sql; do |
130 |
+ googleurl gpu printing sql; do |
131 |
test_targets+=" ${x}_unittests" |
132 |
done |
133 |
|
134 |
|
135 |
|
136 |
|
137 |
1.1 www-client/chromium/chromium-27.0.1425.0.ebuild |
138 |
|
139 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild?rev=1.1&view=markup |
140 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild?rev=1.1&content-type=text/plain |
141 |
|
142 |
Index: chromium-27.0.1425.0.ebuild |
143 |
=================================================================== |
144 |
# Copyright 1999-2013 Gentoo Foundation |
145 |
# Distributed under the terms of the GNU General Public License v2 |
146 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild,v 1.1 2013/03/01 18:01:14 phajdan.jr Exp $ |
147 |
|
148 |
EAPI="5" |
149 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
150 |
|
151 |
CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he |
152 |
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 |
153 |
sv sw ta te th tr uk vi zh_CN zh_TW" |
154 |
|
155 |
inherit chromium eutils flag-o-matic multilib \ |
156 |
pax-utils portability python-any-r1 toolchain-funcs versionator virtualx |
157 |
|
158 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
159 |
HOMEPAGE="http://chromium.org/" |
160 |
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz" |
161 |
|
162 |
LICENSE="BSD" |
163 |
SLOT="0" |
164 |
KEYWORDS="~amd64 ~x86" |
165 |
IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc" |
166 |
|
167 |
# Native Client binaries are compiled with different set of flags, bug #452066. |
168 |
QA_FLAGS_IGNORED=".*\.nexe" |
169 |
|
170 |
RDEPEND="app-accessibility/speech-dispatcher |
171 |
app-arch/bzip2 |
172 |
cups? ( |
173 |
dev-libs/libgcrypt |
174 |
>=net-print/cups-1.3.11 |
175 |
) |
176 |
>=dev-lang/v8-3.16.11.1:= |
177 |
>=dev-libs/elfutils-0.149 |
178 |
dev-libs/expat |
179 |
>=dev-libs/icu-49.1.1-r1:= |
180 |
>=dev-libs/jsoncpp-0.5.0-r1 |
181 |
>=dev-libs/libevent-1.4.13 |
182 |
dev-libs/libxml2[icu] |
183 |
dev-libs/libxslt |
184 |
dev-libs/nspr |
185 |
>=dev-libs/nss-3.12.3 |
186 |
dev-libs/protobuf |
187 |
dev-libs/re2 |
188 |
gnome? ( >=gnome-base/gconf-2.24.0 ) |
189 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
190 |
gps? ( >=sci-geosciences/gpsd-3.7[shm] ) |
191 |
>=media-libs/alsa-lib-1.0.19 |
192 |
media-libs/flac |
193 |
media-libs/harfbuzz |
194 |
>=media-libs/libjpeg-turbo-1.2.0-r1 |
195 |
media-libs/libpng |
196 |
media-libs/libvpx |
197 |
>=media-libs/libwebp-0.2.0_rc1 |
198 |
!arm? ( !x86? ( media-libs/mesa[gles2] ) ) |
199 |
media-libs/opus |
200 |
media-libs/speex |
201 |
pulseaudio? ( media-sound/pulseaudio ) |
202 |
system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] ) |
203 |
>=net-libs/libsrtp-1.4.4_p20121108 |
204 |
sys-apps/dbus |
205 |
sys-apps/pciutils |
206 |
sys-libs/zlib[minizip] |
207 |
virtual/udev |
208 |
virtual/libusb:1 |
209 |
x11-libs/gtk+:2 |
210 |
x11-libs/libXinerama |
211 |
x11-libs/libXScrnSaver |
212 |
x11-libs/libXtst |
213 |
kerberos? ( virtual/krb5 ) |
214 |
selinux? ( |
215 |
sec-policy/selinux-chromium |
216 |
sys-libs/libselinux |
217 |
)" |
218 |
DEPEND="${RDEPEND} |
219 |
${PYTHON_DEPS} |
220 |
!arm? ( |
221 |
>=dev-lang/nacl-toolchain-newlib-0_p9093 |
222 |
dev-lang/yasm |
223 |
) |
224 |
dev-lang/perl |
225 |
dev-python/ply |
226 |
dev-python/simplejson |
227 |
>=dev-util/gperf-3.0.3 |
228 |
sys-apps/hwids |
229 |
>=sys-devel/bison-2.4.3 |
230 |
sys-devel/flex |
231 |
>=sys-devel/make-3.81-r2 |
232 |
virtual/pkgconfig |
233 |
test? ( dev-python/pyftpdlib )" |
234 |
RDEPEND+=" |
235 |
!=www-client/chromium-9999 |
236 |
x11-misc/xdg-utils |
237 |
virtual/ttf-fonts" |
238 |
|
239 |
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
240 |
EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
241 |
fi |
242 |
|
243 |
pkg_setup() { |
244 |
if [[ "${SLOT}" == "0" ]]; then |
245 |
CHROMIUM_SUFFIX="" |
246 |
else |
247 |
CHROMIUM_SUFFIX="-${SLOT}" |
248 |
fi |
249 |
CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" |
250 |
|
251 |
# Make sure the build system will use the right python, bug #344367. |
252 |
python-any-r1_pkg_setup |
253 |
|
254 |
if ! use selinux; then |
255 |
chromium_suid_sandbox_check_kernel_config |
256 |
fi |
257 |
|
258 |
if use bindist && ! use system-ffmpeg; then |
259 |
elog "bindist enabled: H.264 video support will be disabled." |
260 |
fi |
261 |
if ! use bindist; then |
262 |
elog "bindist disabled: Resulting binaries may not be legal to re-distribute." |
263 |
fi |
264 |
} |
265 |
|
266 |
src_prepare() { |
267 |
if ! use arm; then |
268 |
mkdir -p out/Release/obj/gen/sdk/toolchain || die |
269 |
cp -a /usr/$(get_libdir)/nacl-toolchain-newlib \ |
270 |
out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die |
271 |
touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die |
272 |
fi |
273 |
|
274 |
# Fix build without NaCl glibc toolchain. |
275 |
epatch "${FILESDIR}/${PN}-ppapi-r0.patch" |
276 |
|
277 |
epatch "${FILESDIR}/${PN}-gpsd-r0.patch" |
278 |
epatch "${FILESDIR}/${PN}-system-v8-r0.patch" |
279 |
epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" |
280 |
|
281 |
epatch_user |
282 |
|
283 |
# Remove most bundled libraries. Some are still needed. |
284 |
find third_party -type f \! -iname '*.gyp*' \ |
285 |
\! -path 'third_party/WebKit/*' \ |
286 |
\! -path 'third_party/angle/*' \ |
287 |
\! -path 'third_party/cacheinvalidation/*' \ |
288 |
\! -path 'third_party/cld/*' \ |
289 |
\! -path 'third_party/cros_system_api/*' \ |
290 |
\! -path 'third_party/ffmpeg/*' \ |
291 |
\! -path 'third_party/flot/*' \ |
292 |
\! -path 'third_party/hunspell/*' \ |
293 |
\! -path 'third_party/hyphen/*' \ |
294 |
\! -path 'third_party/iccjpeg/*' \ |
295 |
\! -path 'third_party/jstemplate/*' \ |
296 |
\! -path 'third_party/khronos/*' \ |
297 |
\! -path 'third_party/leveldatabase/*' \ |
298 |
\! -path 'third_party/libjingle/*' \ |
299 |
\! -path 'third_party/libphonenumber/*' \ |
300 |
\! -path 'third_party/libxml/chromium/*' \ |
301 |
\! -path 'third_party/libXNVCtrl/*' \ |
302 |
\! -path 'third_party/libyuv/*' \ |
303 |
\! -path 'third_party/lss/*' \ |
304 |
\! -path 'third_party/mesa/*' \ |
305 |
\! -path 'third_party/modp_b64/*' \ |
306 |
\! -path 'third_party/mongoose/*' \ |
307 |
\! -path 'third_party/mt19937ar/*' \ |
308 |
\! -path 'third_party/npapi/*' \ |
309 |
\! -path 'third_party/openmax/*' \ |
310 |
\! -path 'third_party/ots/*' \ |
311 |
\! -path 'third_party/pywebsocket/*' \ |
312 |
\! -path 'third_party/qcms/*' \ |
313 |
\! -path 'third_party/sfntly/*' \ |
314 |
\! -path 'third_party/skia/*' \ |
315 |
\! -path 'third_party/smhasher/*' \ |
316 |
\! -path 'third_party/sqlite/*' \ |
317 |
\! -path 'third_party/tcmalloc/*' \ |
318 |
\! -path 'third_party/tlslite/*' \ |
319 |
\! -path 'third_party/trace-viewer/*' \ |
320 |
\! -path 'third_party/undoview/*' \ |
321 |
\! -path 'third_party/v8-i18n/*' \ |
322 |
\! -path 'third_party/webdriver/*' \ |
323 |
\! -path 'third_party/webrtc/*' \ |
324 |
\! -path 'third_party/widevine/*' \ |
325 |
\! -path 'third_party/x86inc/*' \ |
326 |
-delete || die |
327 |
|
328 |
# Remove bundled v8. |
329 |
find v8 -type f \! -iname '*.gyp*' -delete || die |
330 |
} |
331 |
|
332 |
src_configure() { |
333 |
local myconf="" |
334 |
|
335 |
# Never tell the build system to "enable" SSE2, it has a few unexpected |
336 |
# additions, bug #336871. |
337 |
myconf+=" -Ddisable_sse2=1" |
338 |
|
339 |
# Optional tcmalloc. Note it causes problems with e.g. NVIDIA |
340 |
# drivers, bug #413637. |
341 |
myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)" |
342 |
|
343 |
# Disable glibc Native Client toolchain, we don't need it (bug #417019). |
344 |
myconf+=" -Ddisable_glibc=1" |
345 |
|
346 |
# TODO: also build with pnacl |
347 |
myconf+=" -Ddisable_pnacl=1" |
348 |
|
349 |
# It would be awkward for us to tar the toolchain and get it untarred again |
350 |
# during the build. |
351 |
myconf+=" -Ddisable_newlib_untar=1" |
352 |
|
353 |
# Make it possible to remove third_party/adobe. |
354 |
echo > "${T}/flapper_version.h" || die |
355 |
myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" |
356 |
|
357 |
# Use system-provided libraries. |
358 |
# TODO: use_system_hunspell (upstream changes needed). |
359 |
# TODO: use_system_ssl (http://crbug.com/58087). |
360 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
361 |
myconf+=" |
362 |
-Duse_system_bzip2=1 |
363 |
-Duse_system_flac=1 |
364 |
-Duse_system_harfbuzz=1 |
365 |
-Duse_system_icu=1 |
366 |
-Duse_system_jsoncpp=1 |
367 |
-Duse_system_libevent=1 |
368 |
-Duse_system_libjpeg=1 |
369 |
-Duse_system_libpng=1 |
370 |
-Duse_system_libsrtp=1 |
371 |
-Duse_system_libusb=1 |
372 |
-Duse_system_libvpx=1 |
373 |
-Duse_system_libwebp=1 |
374 |
-Duse_system_libxml=1 |
375 |
-Duse_system_minizip=1 |
376 |
-Duse_system_nspr=1 |
377 |
-Duse_system_opus=1 |
378 |
-Duse_system_protobuf=1 |
379 |
-Duse_system_re2=1 |
380 |
-Duse_system_speex=1 |
381 |
-Duse_system_v8=1 |
382 |
-Duse_system_xdg_utils=1 |
383 |
-Duse_system_zlib=1 |
384 |
$(gyp_use system-ffmpeg use_system_ffmpeg)" |
385 |
|
386 |
# TODO: Use system mesa on x86, bug #457130 . |
387 |
if ! use x86 && ! use arm; then |
388 |
myconf+=" |
389 |
-Duse_system_mesa=1" |
390 |
fi |
391 |
|
392 |
# TODO: patch gyp so that this arm conditional is not needed. |
393 |
if ! use arm; then |
394 |
myconf+=" |
395 |
-Duse_system_yasm=1" |
396 |
fi |
397 |
|
398 |
# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287). |
399 |
myconf+=" |
400 |
-Dmedia_use_libvpx=0" |
401 |
|
402 |
# Optional dependencies. |
403 |
# TODO: linux_link_kerberos, bug #381289. |
404 |
myconf+=" |
405 |
$(gyp_use cups) |
406 |
$(gyp_use gnome use_gconf) |
407 |
$(gyp_use gnome-keyring use_gnome_keyring) |
408 |
$(gyp_use gnome-keyring linux_link_gnome_keyring) |
409 |
$(gyp_use gps linux_use_libgps) |
410 |
$(gyp_use gps linux_link_libgps) |
411 |
$(gyp_use kerberos) |
412 |
$(gyp_use pulseaudio) |
413 |
$(gyp_use selinux selinux)" |
414 |
|
415 |
# Use explicit library dependencies instead of dlopen. |
416 |
# This makes breakages easier to detect by revdep-rebuild. |
417 |
myconf+=" |
418 |
-Dlinux_link_gsettings=1 |
419 |
-Dlinux_link_libpci=1 |
420 |
-Dlinux_link_libspeechd=1" |
421 |
|
422 |
# TODO: use the file at run time instead of effectively compiling it in. |
423 |
myconf+=" |
424 |
-Dusb_ids_path=/usr/share/misc/usb.ids" |
425 |
|
426 |
if ! use selinux; then |
427 |
# Enable SUID sandbox. |
428 |
myconf+=" |
429 |
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
430 |
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
431 |
fi |
432 |
|
433 |
# Never use bundled gold binary. Disable gold linker flags for now. |
434 |
myconf+=" |
435 |
-Dlinux_use_gold_binary=0 |
436 |
-Dlinux_use_gold_flags=0" |
437 |
|
438 |
# Always support proprietary codecs. |
439 |
myconf+=" -Dproprietary_codecs=1" |
440 |
|
441 |
if ! use bindist && ! use system-ffmpeg; then |
442 |
# Enable H.624 support in bundled ffmpeg. |
443 |
myconf+=" -Dffmpeg_branding=Chrome" |
444 |
fi |
445 |
|
446 |
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
447 |
# Note: these are for Gentoo use ONLY. For your own distribution, |
448 |
# please get your own set of keys. Feel free to contact chromium@g.o |
449 |
# for more info. |
450 |
myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc |
451 |
-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com |
452 |
-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" |
453 |
|
454 |
local myarch="$(tc-arch)" |
455 |
if [[ $myarch = amd64 ]] ; then |
456 |
myconf+=" -Dtarget_arch=x64" |
457 |
elif [[ $myarch = x86 ]] ; then |
458 |
myconf+=" -Dtarget_arch=ia32" |
459 |
elif [[ $myarch = arm ]] ; then |
460 |
# TODO: re-enable NaCl (NativeClient). |
461 |
myconf+=" -Dtarget_arch=arm |
462 |
-Dsysroot= |
463 |
-Darmv7=0 |
464 |
-Darm_neon=0 |
465 |
-Ddisable_nacl=1" |
466 |
else |
467 |
die "Failed to determine target arch, got '$myarch'." |
468 |
fi |
469 |
|
470 |
# Make sure that -Werror doesn't get added to CFLAGS by the build system. |
471 |
# Depending on GCC version the warnings are different and we don't want |
472 |
# the build to fail because of that. |
473 |
myconf+=" -Dwerror=" |
474 |
|
475 |
# Avoid CFLAGS problems, bug #352457, bug #390147. |
476 |
if ! use custom-cflags; then |
477 |
replace-flags "-Os" "-O2" |
478 |
strip-flags |
479 |
fi |
480 |
|
481 |
# Make sure the build system will use the right tools, bug #340795. |
482 |
tc-export AR CC CXX RANLIB |
483 |
|
484 |
# Tools for building programs to be executed on the build system, bug #410883. |
485 |
tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX |
486 |
|
487 |
egyp_chromium ${myconf} || die |
488 |
} |
489 |
|
490 |
src_compile() { |
491 |
local test_targets |
492 |
for x in base cacheinvalidation crypto \ |
493 |
googleurl gpu printing sql; do |
494 |
test_targets+=" ${x}_unittests" |
495 |
done |
496 |
|
497 |
local make_targets="chrome chromedriver" |
498 |
if ! use selinux; then |
499 |
make_targets+=" chrome_sandbox" |
500 |
fi |
501 |
if use test; then |
502 |
make_targets+=$test_targets |
503 |
fi |
504 |
|
505 |
# See bug #410883 for more info about the .host mess. |
506 |
emake ${make_targets} BUILDTYPE=Release V=1 \ |
507 |
CC.host="${BUILD_CC}" CFLAGS.host="${BUILD_CFLAGS}" \ |
508 |
CXX.host="${BUILD_CXX}" CXXFLAGS.host="${BUILD_CXXFLAGS}" \ |
509 |
LINK.host="${BUILD_CXX}" LDFLAGS.host="${BUILD_LDFLAGS}" \ |
510 |
AR.host="${BUILD_AR}" || die |
511 |
|
512 |
pax-mark m out/Release/chrome |
513 |
if use test; then |
514 |
for x in $test_targets; do |
515 |
pax-mark m out/Release/${x} |
516 |
done |
517 |
fi |
518 |
} |
519 |
|
520 |
src_test() { |
521 |
# For more info see bug #350349. |
522 |
local mylocale='en_US.utf8' |
523 |
if ! locale -a | grep -q "$mylocale"; then |
524 |
eerror "${PN} requires ${mylocale} locale for tests" |
525 |
eerror "Please read the following guides for more information:" |
526 |
eerror " http://www.gentoo.org/doc/en/guide-localization.xml" |
527 |
eerror " http://www.gentoo.org/doc/en/utf-8.xml" |
528 |
die "locale ${mylocale} is not supported" |
529 |
fi |
530 |
|
531 |
# For more info see bug #370957. |
532 |
if [[ $UID -eq 0 ]]; then |
533 |
die "Tests must be run as non-root. Please use FEATURES=userpriv." |
534 |
fi |
535 |
|
536 |
runtest() { |
537 |
local cmd=$1 |
538 |
shift |
539 |
local filter="--gtest_filter=$(IFS=:; echo "-${*}")" |
540 |
einfo "${cmd}" "${filter}" |
541 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}" |
542 |
} |
543 |
|
544 |
local excluded_base_unittests=( |
545 |
"ICUStringConversionsTest.*" # bug #350347 |
546 |
"MessagePumpLibeventTest.*" # bug #398591 |
547 |
) |
548 |
runtest out/Release/base_unittests "${excluded_base_unittests[@]}" |
549 |
|
550 |
runtest out/Release/cacheinvalidation_unittests |
551 |
runtest out/Release/crypto_unittests |
552 |
runtest out/Release/googleurl_unittests |
553 |
runtest out/Release/gpu_unittests |
554 |
|
555 |
# TODO: re-enable when we get the test data in a separate tarball. |
556 |
# runtest out/Release/media_unittests |
557 |
|
558 |
# local excluded_net_unittests=( |
559 |
# "NetUtilTest.IDNToUnicode*" # bug 361885 |
560 |
# "NetUtilTest.FormatUrl*" # see above |
561 |
# "DnsConfigServiceTest.GetSystemConfig" # bug #394883 |
562 |
# "CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269 |
563 |
# "URLFetcher*" # bug #425764 |
564 |
# "HTTPSOCSPTest.*" # bug #426630 |
565 |
# "HTTPSEVCRLSetTest.*" # see above |
566 |
# "HTTPSCRLSetTest.*" # see above |
567 |
#) |
568 |
# runtest out/Release/net_unittests "${excluded_net_unittests[@]}" |
569 |
|
570 |
runtest out/Release/printing_unittests |
571 |
runtest out/Release/sql_unittests |
572 |
} |
573 |
|
574 |
src_install() { |
575 |
exeinto "${CHROMIUM_HOME}" |
576 |
doexe out/Release/chrome || die |
577 |
|
578 |
if ! use selinux; then |
579 |
doexe out/Release/chrome_sandbox || die |
580 |
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
581 |
fi |
582 |
|
583 |
doexe out/Release/chromedriver || die |
584 |
|
585 |
if ! use arm; then |
586 |
doexe out/Release/nacl_helper{,_bootstrap} || die |
587 |
insinto "${CHROMIUM_HOME}" |
588 |
doins out/Release/nacl_irt_*.nexe || die |
589 |
doins out/Release/libppGoogleNaClPluginChrome.so || die |
590 |
fi |
591 |
|
592 |
newexe "${FILESDIR}"/chromium-launcher-r3.sh chromium-launcher.sh || die |
593 |
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then |
594 |
sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ |
595 |
-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die |
596 |
sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ |
597 |
-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die |
598 |
sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ |
599 |
-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die |
600 |
fi |
601 |
|
602 |
# It is important that we name the target "chromium-browser", |
603 |
# xdg-utils expect it; bug #355517. |
604 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die |
605 |
# keep the old symlink around for consistency |
606 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die |
607 |
|
608 |
# Allow users to override command-line options, bug #357629. |
609 |
dodir /etc/chromium || die |
610 |
insinto /etc/chromium |
611 |
newins "${FILESDIR}/chromium.default" "default" || die |
612 |
|
613 |
pushd out/Release/locales > /dev/null || die |
614 |
chromium_remove_language_paks |
615 |
popd |
616 |
|
617 |
insinto "${CHROMIUM_HOME}" |
618 |
doins out/Release/*.pak || die |
619 |
|
620 |
doins -r out/Release/locales || die |
621 |
doins -r out/Release/resources || die |
622 |
|
623 |
newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die |
624 |
newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die |
625 |
|
626 |
if ! use system-ffmpeg; then |
627 |
doexe out/Release/libffmpegsumo.so || die |
628 |
fi |
629 |
|
630 |
# Install icons and desktop entry. |
631 |
local branding size |
632 |
for size in 16 22 24 32 48 64 128 256 ; do |
633 |
case ${size} in |
634 |
16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; |
635 |
*) branding="chrome/app/theme/chromium" ;; |
636 |
esac |
637 |
newicon -s ${size} "${branding}/product_logo_${size}.png" \ |
638 |
chromium-browser${CHROMIUM_SUFFIX}.png |
639 |
done |
640 |
|
641 |
local mime_types="text/html;text/xml;application/xhtml+xml;" |
642 |
mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
643 |
mime_types+="x-scheme-handler/ftp;" # bug #412185 |
644 |
mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 |
645 |
make_desktop_entry \ |
646 |
chromium-browser${CHROMIUM_SUFFIX} \ |
647 |
"Chromium${CHROMIUM_SUFFIX}" \ |
648 |
chromium-browser${CHROMIUM_SUFFIX} \ |
649 |
"Network;WebBrowser" \ |
650 |
"MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
651 |
sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
652 |
|
653 |
# Install GNOME default application entry (bug #303100). |
654 |
if use gnome; then |
655 |
dodir /usr/share/gnome-control-center/default-apps || die |
656 |
insinto /usr/share/gnome-control-center/default-apps |
657 |
newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die |
658 |
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then |
659 |
sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ |
660 |
"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml |
661 |
fi |
662 |
fi |
663 |
} |