From: Paweł Hajdan Date: Wed, 18 Mar 2015 19:48:16 +0000 (+0000) Subject: Dev channel bump. Replace bindist with proprietary-codecs USE flag (bug #538628 by... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8375df33cd94533aae5ad315552ba96f958f61df;p=gentoo.git Dev channel bump. Replace bindist with proprietary-codecs USE flag (bug #538628 by pacho). Package-Manager: portage-2.2.14/cvs/Linux i686 Manifest-Sign-Key: 0x4F1A2555EA71991D! --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 338883730681..4a357598d255 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/chromium # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1210 2015/03/12 13:10:53 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1211 2015/03/18 19:47:38 phajdan.jr Exp $ + +*chromium-43.0.2334.0 (18 Mar 2015) + + 18 Mar 2015; Pawel Hajdan jr + +chromium-43.0.2334.0.ebuild, metadata.xml: + Dev channel bump. Replace bindist with proprietary-codecs USE flag (bug + #538628 by pacho). *chromium-43.0.2327.5 (12 Mar 2015) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 22087dc33dee..90cf70ad56d8 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -16,28 +16,30 @@ DIST chromium-41.0.2272.76.tar.xz 301532460 SHA256 31e2ae88ad4604e79dbcf7258f661 DIST chromium-42.0.2311.15.tar.xz 305878804 SHA256 6615b8e57bf5f78dd30f214212ba9b4beaa4813f557adc9937966d09515305f1 SHA512 fda85fffdf0ee36f6d39d8b99eb7bc540b4289838a207feb215313637fed583104c6da855427a6af64b8ae20ad331d6dba7fc2d16aaa16d978c66b12cb302ce0 WHIRLPOOL 8b929c39b2ecfaf4522b262c2556fb157f81e20ed08e0a82c4e616c00eb943a025613001b1540da189e92f8df2362da19f8ef63ed3d7434053106afc958f259b DIST chromium-42.0.2311.4.tar.xz 305751788 SHA256 5137b2bc9967e2adcc97c421e2c3f2b46dc4cace54e30ad42b6aef7ff769cae0 SHA512 18c992c4413f656a456897abd6f162381b193469b0f70df1bcb05e8970864cff991ca24e6030069fc50d1ea4afed90fde6bd41e2d6243e13a1078f1124c5ce97 WHIRLPOOL d7df46727cb035785c5c86b93798de8c8292dfed70ff4474556d3e4bdd582b4bc683e6755cb5c3031bf34943f1975e155778ee6a3e27701065edad5cf93b445c DIST chromium-43.0.2327.5.tar.xz 306622640 SHA256 d69c08ff9a0371e432dd4bd16ba8edcbd6cde4187f9fe3ccfea31d1beabf324d SHA512 a4e9a631d191cef0eef1acc48ff947457bd9ff76d93424932b7c2779596fac3a89632eca9e60d4019d69fc51920d1266d3ffe30a99c72c5c4f51e9dd718a5f2b WHIRLPOOL d64025390d76615641c086371821718717788cab745cd441b6fb2d91b9c8b90a2badf5bab91cf5779e316f6f0f6b48dc85f12117f4ab356ce6118d0b0a2fa588 +DIST chromium-43.0.2334.0.tar.xz 307525440 SHA256 895b43d4ae72a3122f344f9f57ead2016c621ee84395eae96fa7c8cb8562da67 SHA512 c5a4aa3cbef35264382fb3c37cef67f23eb7521e12cf4254c1661014e46c6add327265e20cc5206e5b277b94981a85c7a4b73e37117a68c569d7bf8c7419faf8 WHIRLPOOL 42b8a0589b3ac9cbf758212a717fc83dd64437e002f268b89ce939ce9602bfe35db7f71d82147152755e593eb17c1ac950ca69f2d429bb5178c2eaaa2f71d5b6 EBUILD chromium-41.0.2272.76.ebuild 20137 SHA256 3bade947aee25e6f0935867f384399b55c0385b2044fd7ca6ddc8dd924dc63ad SHA512 e934b80809f410b6538e998cf03713378030c06611b29965673f1257c1013921860e342818812f90f73a902a53c6bcc2e7c57b419662f1017fbaa2b8dfecd9dd WHIRLPOOL 3479d4c37cbb8e23929040e173e0615c6566757a51ee6f3937b67cfdb8d68630b3b6cc97b873bc4c655f7669096902c0ab53ddf2861f47ff463aa1878f84b2e6 EBUILD chromium-42.0.2311.15.ebuild 20379 SHA256 d0de3cb357233d2502fe87f769574acd45dd73c268b218ecdbd27942eb7c5ad3 SHA512 3dc39fbcb352cc237ecf10efac7e10d75345dc616c1616af22a4ca1944bb2ba2f4be58931ddaf74dbff69457a76d5d03127b5a6572506e9524a48291efbcc81f WHIRLPOOL 45f8129e5b65220199afdfa675a074f03e87d5d815d13e08708a8a046ecdf49a6f0045cfc4fe64ea675315d71b4f970e7680b81c8684655a111d366f94503fd5 EBUILD chromium-42.0.2311.4.ebuild 20163 SHA256 7ccfe4bcc079511b0dedf2f7c2ad289df0cd1ac8008dd0377c7e439a33d8e4da SHA512 c4bc55a800d5a185822fb2973156d76b322165a8dd7d3462c6f4b818bf805a0c35e2d420d7fc70a7c6d740843fb026cda0d62aab447914ea6784ca709b7d5a9e WHIRLPOOL 9409306247d059988e45e70a4c29b0d13cbe988007ebb1974cb656abc9dffe27da9b522ded2013000b2c2137f5ace66fd0784785711a2a08b503adb0a97f66b8 EBUILD chromium-43.0.2327.5.ebuild 20378 SHA256 4978a5a1b4507fb91769233dbbeba89fc8fef50098b0790144044c256fc20678 SHA512 35ae1428e1695a1c377aa3679e316ecb676003ea2bfb90d7ec4a28a6c519e539bc7ff4e082f1dcc52aa908a479eb2eef81fb5af5ae9b7fa7f65d7bdca93d283e WHIRLPOOL 8da45e007e502d07fb8485f1dca5b45e60ac2cdc66fe766cca7801f67c2eea8670d3ab2a8f8929faa82b08149d7fe48f8630bcc31134f40d1bb0e2e8224968fa -MISC ChangeLog 6681 SHA256 d9f182cc843d57d8f714bfc61cc06e3c43619229116f24dd8dc6bd3a70133c83 SHA512 732ad4bc67c23c1071a8df55eb8555758167fd8f22850a25b4cfe0b658018f4832a1026bd2e73e29d45a87a130d040122dc15481ef7daa94f941851ccfe23669 WHIRLPOOL 7a6dbec99dc03468303db25ad4cd09ab740dce8f1dad09fae31c8abebd688a4c22ca7cc3470871ad527138212ca0e8d044f2dcfe14f3467ad7c5f3e667bffaf9 +EBUILD chromium-43.0.2334.0.ebuild 20105 SHA256 252ef24872a2f9b193b1c762d95cf37f88ec972e041d54294185852f321d586a SHA512 fa0486d42aaf41e578f2d0924328bb7961f5a7af475af99bd85845127c96a6f7fa41435d90edeb2ce22fdcd17b35004c5a44c0a4fcad39089a487590c11620fb WHIRLPOOL 23406a72e42482ca0fcfe0faa584fdb6ae101685ca5d4a0b8d42e31c933234a55bbe7d9fc8959ee568a66b79f4d215032729a80fdb9d827255b827c750cb38ad +MISC ChangeLog 6915 SHA256 02433fde402dc619a64f1835e592ccb708027acaab2e508bfc8cfe374d82de22 SHA512 e582399f8572e6959e6cf2c1b73dc81683f90668a00d05cda6ef438c01849fd085d9e4372c22aec076d0d97e8f9d52879771cb48a907887b692566f4710fc00f WHIRLPOOL 6ccaa6a03d8125a41158d6b54d694fdd2cbce926a1e2a3e0287b0158facc9364c3da8d085c1e56d0cc875ad3eb6a77f0671df2275578446ceeb9f2035e7697d5 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea -MISC metadata.xml 711 SHA256 1e18c739e77946b63028931cb8b11f10deb618965e33cff6f653607f7464983d SHA512 284d32a4db3451ffd522fd6db99cdd7d4130fe186a7a5b746d238f3d7d6677f0a49613cc95b52bad2d26f02877b0b8668a5eaf6f98c8e56a8967b045c23fd77b WHIRLPOOL f035f1168195c7858659ee32e33d4f1aaecf6e761ae756291c2dbcf8deddac6ffafab6b1c8d984eeb4b08efd28a36a0acdf9294918141328f6d68313f3fa2235 +MISC metadata.xml 794 SHA256 325b937cabfd7753347c3c911fb8be689b4a7b021430fca37a92c26e7af35433 SHA512 079c7985283d160b85a8dcd53fd54538ee83b9b36fb99327f03aeff16eb3c6dcbb399a01a381094a67be901d970f3c8fa649b2ac156522df3156db2853b6566f WHIRLPOOL c110adec0f1dcb170e4ba52523109d340543d37027f4c6c9f6e6998744c2720177f03a963e7cd162512459c193e5107f0764b8e3dccf7278b008e7cb8a715b8f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVAZBkAAoJEE8aJVXqcZkdnI4P/0DVoGNZ9edLVU9nGDFcFXn0 -YrHqp8iuVqI6y6dP7Th6yvawUsEYe6XoL5PQURAheBLnR5YtywZjIgQsQU4ZAUnd -CJfxqdMqn3v/dN/iASsYT6uuHUacHo6bOzFuLkMS64fLILMraEQ+8vk1QE/8TY0h -DyZstnkv+tt/Z9ZbCgZKDuBXT5kuOGC9/btzySkKk+mjqcIHqJOK0XWgXDTdkiZV -d2wcK43MTPFsY5rRI6njIO/B1RV1NfnjeZvqVwJdiX26Sn0NXj9KJlafHY89RBHA -QozJ/lCaVX8rYq7H//hyJ78reTqHEWwApFQeFGZUjCGDzvPHqtSIKNkkrv6H1eh4 -OpgKzh0/JK2ywBNkX3a109385MuBj6+cVAsd37AW3csKudP9c8nKCSvfm5YPHl28 -EsMfiUWBZWqRGSv7UohGK3euwvIrW+y+xeUEVSgxs1OSQbMeKhr1pHcOTU84o/d+ -DifuhcCZmb84z75FQhKIyJ7lZo/UxPRh5hrRhhU4tDQvDnuXToEb2hToy9V2tWsg -TfgEbK/sEFAo3xeGeHHkRJITsgWDX0bowcsTHdo9ZffDORljH/ogCfj4stS54RRA -M/QD5C5safnhgpefnR+RkHZA/eyImc+SjDTbBkqPfjmL2Khti1nKlADCqf99UIYq -ZsyI7tWEb+IVxZ5EJN2Y -=H97d +iQIcBAEBCAAGBQJVCdZ6AAoJEE8aJVXqcZkdaSYQAJbOcW+DHb4PxW+o3bEKg6bp +dHPYZBpdaPhqpIFr0fDm3LhdiT4/WPPCreaNtYZkKrIzfJAf+gnL9cNN3LTYzBcs +ON/0YWij0eY+Qxm5z7pfUmrB6Mc5SoHAMp4QZVgxN5PhUxjRMZEjYYP4gFj8CcT5 +MKZH9Ia469KWQOD4dJztioQj5NT4IStVkZBDfZ/96s9ePRHdpB2wKFslJkP84Rv8 +fZAnfGeYLypbSv/wZPBrGd6EttPoLQCMkJDSqhQr5oRKXFoDEfadSQuO5LUqCifZ +JFEwPNuxEAcA4BNNy3nLAOLeaJFi56lnlUlxHlW6q66XPKh7s21Rx+K922XCvdcT +GhR/RHQcbV6Se1Fy+dvAEy/j9gsu6LrgEfx/ABE8EtMI4Mq1kioTTFaeUUrEPCZ2 +cuQJ+MBfkS1lq1YN2kxNeDQdQk4fzaf+aba8K8kSHJyrqOsxZd9kecktP8QQVsPK +pmAzzBBo1X+9rUqhTlnS3vgMWU2eN7qHEQenXsVC8H/10gS0UTjUY6UtIjZQraau +6wYVrdDasS+MkkHFn/aov+/vedku1Tj3b+qWwi3NMx+6kU4buMQwdXvzfj5boj1V +2G6eRUC4JQoIyMuxgv9q7VxPYeeQ65r7QW8C8ga3ujKLT+VKigZpZf0MmMk9Pyf1 +6xhoBxt9K7SEqRC/mjxX +=ODGv -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-43.0.2334.0.ebuild b/www-client/chromium/chromium-43.0.2334.0.ebuild new file mode 100644 index 000000000000..273e2a21f309 --- /dev/null +++ b/www-client/chromium/chromium-43.0.2334.0.ebuild @@ -0,0 +1,641 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2334.0.ebuild,v 1.1 2015/03/18 19:47:38 phajdan.jr Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_6,2_7} ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he + 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 + sv sw ta te th tr uk vi zh_CN zh_TW" + +inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \ + portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="cups gnome gnome-keyring hidpi kerberos neon pic proprietary-codecs pulseaudio selinux +tcmalloc widevine" +RESTRICT="proprietary-codecs? ( bindist )" + +# Native Client binaries are compiled with different set of flags, bug #452066. +QA_FLAGS_IGNORED=".*\.nexe" + +# Native Client binaries may be stripped by the build system, which uses the +# right tools for it, bug #469144 . +QA_PRESTRIPPED=".*\.nexe" + +RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= + app-arch/bzip2:= + app-arch/snappy:= + app-crypt/libsecret:= + cups? ( + dev-libs/libgcrypt:0= + >=net-print/cups-1.3.11:= + ) + >=dev-libs/elfutils-0.149 + dev-libs/expat:= + dev-libs/glib:= + dev-libs/icu:= + >=dev-libs/jsoncpp-0.5.0-r1:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + dev-libs/nspr:= + >=dev-libs/nss-3.14.3:= + dev-libs/re2:= + gnome? ( >=gnome-base/gconf-2.24.0:= ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/flac:= + media-libs/fontconfig:= + media-libs/freetype:= + media-libs/harfbuzz:=[icu(+)] + media-libs/libexif:= + >=media-libs/libjpeg-turbo-1.2.0-r1:= + media-libs/libpng:0= + >=media-libs/libwebp-0.4.0:= + media-libs/speex:= + pulseaudio? ( media-sound/pulseaudio:= ) + sys-apps/dbus:= + sys-apps/pciutils:= + >=sys-libs/libcap-2.22:= + sys-libs/zlib:=[minizip] + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:= + x11-libs/gtk+:2= + x11-libs/libdrm + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXinerama:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND} + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + dev-perl/JSON + >=dev-util/gperf-3.0.3 + dev-util/ninja + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig + widevine? ( www-plugins/chrome-binary-plugins[widevine] )" + # We build-dep on having widevine, because the patch + # below must extract the current version. + +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND+=" + !=www-client/chromium-9999 + ! "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" + epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch" + local WIDEVINE_SUPPORTED_ARCHS="x64 ia32" + local arch + for arch in $WIDEVINE_SUPPORTED_ARCHS; do + mkdir -p third_party/widevine/cdm/linux/$arch + cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine." + done + fi + + epatch_user + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py \ + 'base/third_party/dmg_fp' \ + 'base/third_party/dynamic_annotations' \ + 'base/third_party/icu' \ + 'base/third_party/nspr' \ + 'base/third_party/superfasthash' \ + 'base/third_party/symbolize' \ + 'base/third_party/valgrind' \ + 'base/third_party/xdg_mime' \ + 'base/third_party/xdg_user_dirs' \ + 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mozilla_security_manager' \ + 'courgette/third_party' \ + 'crypto/third_party/nss' \ + 'net/third_party/mozilla_security_manager' \ + 'net/third_party/nss' \ + 'third_party/WebKit' \ + 'third_party/analytics' \ + 'third_party/angle' \ + 'third_party/angle/src/third_party/compiler' \ + 'third_party/brotli' \ + 'third_party/cacheinvalidation' \ + 'third_party/cld_2' \ + 'third_party/cros_system_api' \ + 'third_party/cython/python_flags.py' \ + 'third_party/dom_distiller_js' \ + 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ + 'third_party/ffmpeg' \ + 'third_party/fips181' \ + 'third_party/flot' \ + 'third_party/google_input_tools' \ + 'third_party/google_input_tools/third_party/closure_library' \ + 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ + 'third_party/hunspell' \ + 'third_party/iccjpeg' \ + 'third_party/jstemplate' \ + 'third_party/khronos' \ + 'third_party/leveldatabase' \ + 'third_party/libaddressinput' \ + 'third_party/libjingle' \ + 'third_party/libphonenumber' \ + 'third_party/libsrtp' \ + 'third_party/libudev' \ + 'third_party/libusb' \ + 'third_party/libvpx' \ + 'third_party/libvpx/source/libvpx/third_party/x86inc' \ + 'third_party/libxml/chromium' \ + 'third_party/libXNVCtrl' \ + 'third_party/libyuv' \ + 'third_party/lss' \ + 'third_party/lzma_sdk' \ + 'third_party/mesa' \ + 'third_party/modp_b64' \ + 'third_party/mojo' \ + 'third_party/mt19937ar' \ + 'third_party/npapi' \ + 'third_party/openmax_dl' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/pdfium' \ + 'third_party/pdfium/third_party/base' \ + 'third_party/pdfium/third_party/bigint' \ + 'third_party/pdfium/third_party/freetype' \ + 'third_party/polymer' \ + 'third_party/protobuf' \ + 'third_party/qcms' \ + 'third_party/readability' \ + 'third_party/sfntly' \ + 'third_party/skia' \ + 'third_party/smhasher' \ + 'third_party/sqlite' \ + 'third_party/tcmalloc' \ + 'third_party/trace-viewer' \ + 'third_party/trace-viewer/third_party/components/polymer' \ + 'third_party/trace-viewer/third_party/d3' \ + 'third_party/trace-viewer/third_party/gl-matrix' \ + 'third_party/trace-viewer/third_party/jszip' \ + 'third_party/trace-viewer/third_party/tvcm' \ + 'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \ + 'third_party/undoview' \ + 'third_party/usrsctp' \ + 'third_party/web-animations-js' \ + 'third_party/webdriver' \ + 'third_party/webrtc' \ + 'third_party/widevine' \ + 'third_party/x86inc' \ + 'third_party/zlib/google' \ + 'url/third_party/mozilla' \ + 'v8/src/third_party/fdlibm' \ + 'v8/src/third_party/kernel' \ + 'v8/src/third_party/valgrind' \ + --do-remove || die +} + +src_configure() { + local myconf="" + + # Never tell the build system to "enable" SSE2, it has a few unexpected + # additions, bug #336871. + myconf+=" -Ddisable_sse2=1" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf+=" -Ddisable_nacl=1" + + # Disable glibc Native Client toolchain, we don't need it (bug #417019). + # myconf+=" -Ddisable_glibc=1" + + # TODO: also build with pnacl + # myconf+=" -Ddisable_pnacl=1" + + # It would be awkward for us to tar the toolchain and get it untarred again + # during the build. + # myconf+=" -Ddisable_newlib_untar=1" + + # Make it possible to remove third_party/adobe. + echo > "${T}/flapper_version.h" || die + myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" + + # Use system-provided libraries. + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_libvpx (http://crbug.com/347823). + # TODO: use_system_libusb (http://crbug.com/266149). + # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + myconf+=" + -Duse_system_bzip2=1 + -Duse_system_flac=1 + -Duse_system_harfbuzz=1 + -Duse_system_icu=1 + -Duse_system_jsoncpp=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_libwebp=1 + -Duse_system_libxml=1 + -Duse_system_libxslt=1 + -Duse_system_minizip=1 + -Duse_system_nspr=1 + -Duse_system_re2=1 + -Duse_system_snappy=1 + -Duse_system_speex=1 + -Duse_system_xdg_utils=1 + -Duse_system_zlib=1" + + # Needed for system icu - we don't need additional data files. + myconf+=" -Dicu_use_data_file_flag=0" + + # TODO: patch gyp so that this arm conditional is not needed. + if ! use arm; then + myconf+=" + -Duse_system_yasm=1" + fi + + # Optional dependencies. + # TODO: linux_link_kerberos, bug #381289. + myconf+=" + $(gyp_use cups) + $(gyp_use gnome use_gconf) + $(gyp_use gnome-keyring use_gnome_keyring) + $(gyp_use gnome-keyring linux_link_gnome_keyring) + $(gyp_use hidpi enable_hidpi) + $(gyp_use kerberos) + $(gyp_use pulseaudio) + $(gyp_use tcmalloc use_allocator tcmalloc none)" + + # Use explicit library dependencies instead of dlopen. + # This makes breakages easier to detect by revdep-rebuild. + myconf+=" + -Dlinux_link_gsettings=1 + -Dlinux_link_libpci=1 + -Dlinux_link_libspeechd=1 + -Dlibspeechd_h_prefix=speech-dispatcher/" + + # TODO: use the file at run time instead of effectively compiling it in. + myconf+=" + -Dusb_ids_path=/usr/share/misc/usb.ids" + + # Save space by removing DLOG and DCHECK messages (about 6% reduction). + myconf+=" + -Dlogging_like_official_build=1" + + if [[ $(tc-getCC) == *clang* ]]; then + myconf+=" -Dclang=1" + else + myconf+=" -Dclang=0" + fi + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + myconf+=" + -Dclang_use_chrome_plugins=0 + -Dhost_clang=0 + -Dlinux_use_bundled_binutils=0 + -Dlinux_use_bundled_gold=0 + -Dlinux_use_gold_flags=0" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com + -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + target_arch=x64 + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + target_arch=ia32 + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm ]] ; then + target_arch=arm + ffmpeg_target_arch=$(usex neon arm-neon arm) + # TODO: re-enable NaCl (NativeClient). + local CTARGET=${CTARGET:-${CHOST}} + if [[ $(tc-is-softfloat) == "no" ]]; then + + myconf+=" -Darm_float_abi=hard" + fi + filter-flags "-mfpu=*" + use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" + + if [[ ${CTARGET} == armv[78]* ]]; then + myconf+=" -Darmv7=1" + else + myconf+=" -Darmv7=0" + fi + myconf+=" -Dsysroot= + $(gyp_use neon arm_neon) + -Ddisable_nacl=1" + else + die "Failed to determine target arch, got '$myarch'." + fi + + myconf+=" -Dtarget_arch=${target_arch}" + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf+=" -Dwerror=" + + # Disable fatal linker warnings, bug 506268. + myconf+=" -Ddisable_fatal_linker_warnings=1" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + fi + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX RANLIB + + # Tools for building programs to be executed on the build system, bug #410883. + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export LD_host=${CXX_host} + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -m 755 "${TMPDIR}" || die + + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gyp.py || die + popd > /dev/null || die + + third_party/libaddressinput/chromium/tools/update-strings.py || die + + einfo "Configuring Chromium..." + build/linux/unbundle/replace_gyp_files.py ${myconf} || die + egyp_chromium ${myconf} || die +} + +eninja() { + if [[ -z ${NINJAOPTS+set} ]]; then + local jobs=$(makeopts_jobs) + local loadavg=$(makeopts_loadavg) + + if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then + NINJAOPTS+=" -j ${jobs}" + fi + if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then + NINJAOPTS+=" -l ${loadavg}" + fi + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" + "$@" +} + +src_compile() { + local ninja_targets="chrome chrome_sandbox chromedriver" + + # Build mksnapshot and pax-mark it. + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release ${ninja_targets} || die + + pax-mark m out/Release/chrome +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome || die + + newexe out/Release/chrome_sandbox chrome-sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + + doexe out/Release/chromedriver || die + + # if ! use arm; then + # doexe out/Release/nacl_helper{,_bootstrap} || die + # insinto "${CHROMIUM_HOME}" + # doins out/Release/nacl_irt_*.nexe || die + # doins out/Release/libppGoogleNaClPluginChrome.so || die + # fi + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + if [[ -n ${CHROMIUM_SUFFIX} ]]; then + sedargs+=( + -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" + -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" + -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" + ) + fi + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die + + # Allow users to override command-line options, bug #357629. + dodir /etc/chromium || die + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" || die + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin || die + doins out/Release/*.pak || die + + doins -r out/Release/locales || die + doins -r out/Release/resources || die + + newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die + newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die + + doexe out/Release/libffmpegsumo.so || die + if use widevine; then + doexe out/Release/libwidevinecdmadapter.so || die + fi + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser${CHROMIUM_SUFFIX}.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Chromium${CHROMIUM_SUFFIX}" \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + if use gnome; then + dodir /usr/share/gnome-control-center/default-apps || die + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ + "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml + fi + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml index 018308b7cd6f..768d32352d83 100644 --- a/www-client/chromium/metadata.xml +++ b/www-client/chromium/metadata.xml @@ -7,6 +7,7 @@ Disable patent-encumbered HTML5 video codecs Enable support for high-resolution screens (high dots per inch) Disable optimized assembly code that is not PIC friendly + Enable proprietary codecs like H.264, MP3 Use bundled tcmalloc instead of system malloc Support the Widevine DRM module from www-plugins/chrome-binary-plugins