www-client/chromium: dev channel bump (54.0.2810.2)
authorPawel Hajdan, Jr <phajdan.jr@gentoo.org>
Mon, 1 Aug 2016 19:32:56 +0000 (21:32 +0200)
committerPawel Hajdan, Jr <phajdan.jr@gentoo.org>
Mon, 1 Aug 2016 19:32:56 +0000 (21:32 +0200)
Fix build with system libpng (bug #578212).

Fix build with system libvpx (bug #567652 by Rok Kralj).

Package-Manager: portage-2.2.28

www-client/chromium/Manifest
www-client/chromium/chromium-54.0.2810.2.ebuild [new file with mode: 0644]
www-client/chromium/files/chromium-gn-r3.patch [new file with mode: 0644]
www-client/chromium/files/chromium-last-commit-position-r1.patch [new file with mode: 0644]
www-client/chromium/files/chromium-system-ffmpeg-r3.patch
www-client/chromium/files/chromium-system-jinja-r12.patch [new file with mode: 0644]

index 5f6b2e230699b56b5d344256c0ed4d3b35242ed6..909cb50fb99fae92e1e0bf61e6eb93cdcd6dfc05 100644 (file)
@@ -1,3 +1,4 @@
 DIST chromium-52.0.2743.82.tar.xz 458110272 SHA256 a7de6015df9cf685d68efd1e070ae9c706c723cd9395d079a7d43672a2c37eb4 SHA512 9bba841cb726bfa06888deefacfcee628e36d25de47dd0303d3fd1ce2f07922148d60befe934f44c33fcdfed6ce3dadfb9e3ee0828b66994807178a488051806 WHIRLPOOL f0d258882db85291262c2381aeb6d85ebf20a252344e114a2da35e75f79dc8b73de95b71926512537af17e109fd7a8dd04386d5b3ed610262d42d11bcc1a5707
 DIST chromium-53.0.2785.21.tar.xz 460600312 SHA256 68f4a97af24f0c1c964b6633338eab68ead815833b56ea9a9f925a5b3b35baef SHA512 8ccc84506ca47f0d8c77f542b1c0fe7e8f5b8849ce8378ef49a0b7916822bdc622f4e6a4a53b7c5e2b51b68d191e71b6b6757d2258d732103bca507cfc799e90 WHIRLPOOL 30404088b6e8cd572c9c3715ee0ba75c9823e3acea464c956fcd2f7deee2e375eca35ee10cd254b866ecd91e6653ba876893c4d5b810fbd39f9a1caa470217e6
 DIST chromium-53.0.2785.34.tar.xz 460739532 SHA256 261ba008c96b335a55feff18785b01484af2d678f85b58206008b31c9e9c372f SHA512 99e0b7a30e34f70ec844ef50f02eadadead2b83f2a47ca7d5779cf0a90bf49e7d3efc1bbc98eb4d1294ed283edd04a993a639003a365e06ae8b2adf26cc1c865 WHIRLPOOL dec533670c1664f88ea32fe253644e479b81fb93bd93f1bc5dbfe41c56979a7642afdfcd041ddf05ca3f0da8e1bedc7ddf48779be3b965038026f65ab199f344
+DIST chromium-54.0.2810.2.tar.xz 460923284 SHA256 f038e72cbd8b7383d13c286329623fda8d6d48f45fa2d964e554b5565283ad71 SHA512 069edcc27427dc7e3c6c3af1932b7d88d2070f8280c9e1881bcba3cbf13bd2d74fe13b79d1e89194c51b9edf71b8ff0f5e45a0a9727798cc723cb8237b95df8c WHIRLPOOL 64b32d5b5c06f9a4d3e774d340da935b92c46bb1573923dfd4f5748af310214ff7295f1b1e101dd6cb50de383e36fd2813087af801bed47df889e69441a6a375
diff --git a/www-client/chromium/chromium-54.0.2810.2.ebuild b/www-client/chromium/chromium-54.0.2810.2.ebuild
new file mode 100644 (file)
index 0000000..a0e2a3c
--- /dev/null
@@ -0,0 +1,727 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 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-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
+
+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 ~arm64 ~x86"
+IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
+REQUIRED_USE="gn? ( gnome gnome-keyring !tcmalloc )"
+
+# 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-arch/bzip2:=
+       cups? ( >=net-print/cups-1.3.11:= )
+       >=dev-libs/elfutils-0.149
+       dev-libs/expat:=
+       dev-libs/glib:=
+       >=dev-libs/jsoncpp-0.5.0-r1:=
+       dev-libs/nspr:=
+       >=dev-libs/nss-3.14.3:=
+       gnome? ( >=gnome-base/gconf-2.24.0:= )
+       gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+       >=media-libs/alsa-lib-1.0.19:=
+       media-libs/fontconfig:=
+       media-libs/freetype:=
+       media-libs/libexif:=
+       media-libs/libpng:=
+       media-libs/libvpx:=[svc]
+       media-libs/speex:=
+       pulseaudio? ( media-sound/pulseaudio:= )
+       system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
+       sys-apps/dbus:=
+       sys-apps/pciutils:=
+       >=sys-libs/libcap-2.22:=
+       virtual/udev
+       x11-libs/cairo:=
+       x11-libs/gdk-pixbuf:=
+       gtk3? ( x11-libs/gtk+:3= )
+       !gtk3? ( 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 )
+       !gn? (
+               >=app-accessibility/speech-dispatcher-0.8:=
+               app-arch/snappy:=
+               >=dev-libs/libevent-1.4.13:=
+               dev-libs/libxml2:=[icu]
+               dev-libs/libxslt:=
+               media-libs/flac:=
+               >=media-libs/harfbuzz-0.9.41:=[icu(+)]
+               >=media-libs/libwebp-0.4.0:=
+               sys-libs/zlib:=[minizip]
+       )"
+DEPEND="${RDEPEND}
+       >=app-arch/gzip-1.7
+       !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"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+       !=www-client/chromium-9999
+       !<www-plugins/chrome-binary-plugins-37
+       x11-misc/xdg-utils
+       virtual/opengl
+       virtual/ttf-fonts
+       selinux? ( sec-policy/selinux-chromium )
+       tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+       widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+       dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+       >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+       dev-python/html5lib[${PYTHON_USEDEP}]
+       dev-python/jinja[${PYTHON_USEDEP}]
+       dev-python/ply[${PYTHON_USEDEP}]
+       dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+       has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+       has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+       has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+       has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
+       has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
+       has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+       EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-system-ffmpeg-r3.patch"
+       "${FILESDIR}/${PN}-system-jinja-r12.patch"
+       "${FILESDIR}/${PN}-widevine-r1.patch"
+       "${FILESDIR}/${PN}-last-commit-position-r1.patch"
+       "${FILESDIR}/${PN}-gn-r3.patch"
+)
+
+pkg_pretend() {
+       if [[ $(tc-getCC) == *gcc* ]] && \
+               [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+               die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+       fi
+
+       # Check build requirements, bug #541816 and bug #471810 .
+       CHECKREQS_MEMORY="3G"
+       CHECKREQS_DISK_BUILD="5G"
+       eshopts_push -s extglob
+       if is-flagq '-g?(gdb)?([1-9])'; then
+               CHECKREQS_DISK_BUILD="25G"
+       fi
+       eshopts_pop
+       check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+       if [[ "${SLOT}" == "0" ]]; then
+               CHROMIUM_SUFFIX=""
+       else
+               CHROMIUM_SUFFIX="-${SLOT}"
+       fi
+       CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+       # Make sure the build system will use the right python, bug #344367.
+       python-any-r1_pkg_setup
+
+       chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+       default
+
+       local conditional_bundled_libraries=""
+       if ! use system-ffmpeg; then
+               conditional_bundled_libraries+=" third_party/ffmpeg"
+       fi
+       if use gn; then
+               conditional_bundled_libraries+="
+                       base/third_party/libevent
+                       third_party/adobe
+                       third_party/speech-dispatcher
+                       third_party/usb_ids
+                       third_party/xdg-utils
+                       third_party/yasm/run_yasm.py
+               "
+       fi
+
+       # Remove most bundled libraries. Some are still needed.
+       build/linux/unbundle/remove_bundled_libraries.py \
+               ${conditional_bundled_libraries} \
+               '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' \
+               'net/third_party/mozilla_security_manager' \
+               'net/third_party/nss' \
+               'third_party/WebKit' \
+               'third_party/analytics' \
+               'third_party/angle' \
+               'third_party/angle/src/common/third_party/numerics' \
+               'third_party/angle/src/third_party/compiler' \
+               'third_party/angle/src/third_party/libXNVCtrl' \
+               'third_party/angle/src/third_party/murmurhash' \
+               'third_party/angle/src/third_party/trace_event' \
+               'third_party/boringssl' \
+               'third_party/brotli' \
+               'third_party/cacheinvalidation' \
+               'third_party/catapult' \
+               'third_party/catapult/third_party/polymer' \
+               'third_party/catapult/third_party/py_vulcanize' \
+               'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+               'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
+               'third_party/catapult/tracing/third_party/d3' \
+               'third_party/catapult/tracing/third_party/gl-matrix' \
+               'third_party/catapult/tracing/third_party/jszip' \
+               'third_party/catapult/tracing/third_party/mannwhitneyu' \
+               'third_party/ced' \
+               'third_party/cld_2' \
+               'third_party/cros_system_api' \
+               'third_party/cython/python_flags.py' \
+               'third_party/devscripts' \
+               'third_party/dom_distiller_js' \
+               'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+               'third_party/fips181' \
+               'third_party/flatbuffers' \
+               '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/icu' \
+               'third_party/jstemplate' \
+               'third_party/khronos' \
+               'third_party/leveldatabase' \
+               'third_party/libXNVCtrl' \
+               'third_party/libaddressinput' \
+               'third_party/libjingle' \
+               'third_party/libjpeg_turbo' \
+               'third_party/libphonenumber' \
+               'third_party/libsecret' \
+               'third_party/libsrtp' \
+               'third_party/libudev' \
+               'third_party/libusb' \
+               'third_party/libwebm' \
+               'third_party/libxml/chromium' \
+               'third_party/libyuv' \
+               'third_party/lss' \
+               'third_party/lzma_sdk' \
+               'third_party/mesa' \
+               'third_party/modp_b64' \
+               'third_party/mt19937ar' \
+               'third_party/openh264' \
+               'third_party/openmax_dl' \
+               'third_party/opus' \
+               'third_party/ots' \
+               'third_party/pdfium' \
+               'third_party/pdfium/third_party/agg23' \
+               'third_party/pdfium/third_party/base' \
+               'third_party/pdfium/third_party/bigint' \
+               'third_party/pdfium/third_party/freetype' \
+               'third_party/pdfium/third_party/lcms2-2.6' \
+               'third_party/pdfium/third_party/libjpeg' \
+               'third_party/pdfium/third_party/libopenjpeg20' \
+               'third_party/pdfium/third_party/libpng16' \
+               'third_party/pdfium/third_party/libtiff' \
+               'third_party/pdfium/third_party/zlib_v128' \
+               'third_party/polymer' \
+               'third_party/protobuf' \
+               'third_party/protobuf/third_party/six' \
+               'third_party/qcms' \
+               'third_party/re2' \
+               'third_party/sfntly' \
+               'third_party/skia' \
+               'third_party/smhasher' \
+               'third_party/sqlite' \
+               'third_party/tcmalloc' \
+               'third_party/usrsctp' \
+               'third_party/web-animations-js' \
+               'third_party/webdriver' \
+               'third_party/webrtc' \
+               'third_party/widevine' \
+               'third_party/woff2' \
+               'third_party/x86inc' \
+               'third_party/zlib/google' \
+               'url/third_party/mozilla' \
+               'v8/src/third_party/valgrind' \
+               --do-remove || die
+}
+
+src_configure() {
+       local myconf_gyp=""
+       local myconf_gn=""
+
+       # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+       myconf_gn+=" is_debug=false"
+
+       # Never tell the build system to "enable" SSE2, it has a few unexpected
+       # additions, bug #336871.
+       myconf_gyp+=" -Ddisable_sse2=1"
+
+       # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+       myconf_gyp+=" -Ddisable_nacl=1"
+       myconf_gn+=" enable_nacl=false"
+
+       # Make it possible to remove third_party/adobe.
+       echo > "${T}/flapper_version.h" || die
+       myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+       # Use system-provided libraries.
+       # TODO: use_system_hunspell (upstream changes needed).
+       # TODO: use_system_icu (bug #576370).
+       # TODO: use_system_libjpeg (bug #584518).
+       # TODO: use_system_libsrtp (bug #459932).
+       # 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_re2 (bug #571156).
+       # TODO: use_system_ssl (http://crbug.com/58087).
+       # TODO: use_system_sqlite (http://crbug.com/22208).
+       myconf_gyp+="
+               -Duse_system_bzip2=1
+               -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+               -Duse_system_flac=1
+               -Duse_system_harfbuzz=1
+               -Duse_system_jsoncpp=1
+               -Duse_system_libevent=1
+               -Duse_system_libpng=1
+               -Duse_system_libvpx=1
+               -Duse_system_libwebp=1
+               -Duse_system_libxml=1
+               -Duse_system_libxslt=1
+               -Duse_system_minizip=1
+               -Duse_system_nspr=1
+               -Duse_system_snappy=1
+               -Duse_system_speex=1
+               -Duse_system_xdg_utils=1
+               -Duse_system_zlib=1"
+
+       local gn_system_libraries="
+               flac
+               harfbuzz-ng
+               libevent
+               libpng
+               libvpx
+               libwebp
+               libxml
+               libxslt
+               snappy
+               yasm
+               zlib"
+       if use system-ffmpeg; then
+               gn_system_libraries+=" ffmpeg"
+       fi
+       build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
+
+       # Needed for system icu - we don't need additional data files.
+       # myconf_gyp+=" -Dicu_use_data_file_flag=0"
+
+       # TODO: patch gyp so that this arm conditional is not needed.
+       if ! use arm; then
+               myconf_gyp+="
+                       -Duse_system_yasm=1"
+       fi
+
+       # Optional dependencies.
+       # TODO: linux_link_kerberos, bug #381289.
+       myconf_gyp+="
+               $(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 gtk3)
+               $(gyp_use hangouts enable_hangout_services_extension)
+               $(gyp_use kerberos)
+               $(gyp_use pulseaudio)
+               $(gyp_use tcmalloc use_allocator tcmalloc none)
+               $(gyp_use widevine enable_widevine)"
+
+       # TODO: support USE=gnome-keyring for GN
+       myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+       myconf_gn+=" enable_widevine=$(usex widevine true false)"
+       myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+       myconf_gn+=" use_cups=$(usex cups true false)"
+       myconf_gn+=" use_gconf=$(usex gnome true false)"
+       myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
+       myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+       myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+       # Use explicit library dependencies instead of dlopen.
+       # This makes breakages easier to detect by revdep-rebuild.
+       myconf_gyp+="
+               -Dlinux_link_gsettings=1
+               -Dlinux_link_libpci=1
+               -Dlinux_link_libspeechd=1
+               -Dlibspeechd_h_prefix=speech-dispatcher/"
+
+       # TODO: link_pulseaudio=true for GN.
+
+       # TODO: use the file at run time instead of effectively compiling it in.
+       myconf_gyp+="
+               -Dusb_ids_path=/usr/share/misc/usb.ids"
+
+       myconf_gyp+=" -Dfieldtrial_testing_like_official_build=1"
+       myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+       if [[ $(tc-getCC) == *clang* ]]; then
+               myconf_gyp+=" -Dclang=1"
+               myconf_gn+=" is_clang=true"
+       else
+               myconf_gyp+=" -Dclang=0"
+               myconf_gn+=" is_clang=false"
+       fi
+
+       # Never use bundled gold binary. Disable gold linker flags for now.
+       # Do not use bundled clang.
+       myconf_gyp+="
+               -Dclang_use_chrome_plugins=0
+               -Dhost_clang=0
+               -Dlinux_use_bundled_binutils=0
+               -Dlinux_use_bundled_gold=0
+               -Dlinux_use_gold_flags=0
+               -Dsysroot="
+       # Trying to use gold results in linker crash.
+       myconf_gn+=" use_gold=false use_sysroot=false"
+
+       ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+       myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+       myconf_gn+=" proprietary_codecs=true ffmpeg_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.
+       local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+       local google_default_client_id="329227923882.apps.googleusercontent.com"
+       local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+       myconf_gyp+=" -Dgoogle_api_key=${google_api_key}
+               -Dgoogle_default_client_id=${google_default_client_id}
+               -Dgoogle_default_client_secret=${google_default_client_secret}"
+       myconf_gn+=" google_api_key=\"${google_api_key}\""
+       myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+       myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+       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 = arm64 ]] ; then
+               target_arch=arm64
+               ffmpeg_target_arch=arm64
+       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_gyp+=" -Darm_float_abi=hard"
+               fi
+               filter-flags "-mfpu=*"
+               use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+               if [[ ${CTARGET} == armv[78]* ]]; then
+                       myconf_gyp+=" -Darmv7=1"
+               else
+                       myconf_gyp+=" -Darmv7=0"
+               fi
+               myconf_gyp+=" -Dsysroot=
+                       $(gyp_use neon arm_neon)
+                       -Ddisable_nacl=1"
+       else
+               die "Failed to determine target arch, got '$myarch'."
+       fi
+
+       myconf_gyp+=" -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_gyp+=" -Dwerror="
+       myconf_gn+=" treat_warnings_as_errors=false"
+
+       # Disable fatal linker warnings, bug 506268.
+       myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
+       myconf_gn+=" fatal_linker_warnings=false"
+
+       # 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
+
+               # Prevent libvpx build failures. Bug 530248, 544702, 546984.
+               if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+                       filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+               fi
+       fi
+
+       # Make sure the build system will use the right tools, bug #340795.
+       tc-export AR CC CXX NM
+
+       # Tools for building programs to be executed on the build system, bug #410883.
+       if tc-is-cross-compiler; then
+               export AR_host=$(tc-getBUILD_AR)
+               export CC_host=$(tc-getBUILD_CC)
+               export CXX_host=$(tc-getBUILD_CXX)
+               export NM_host=$(tc-getBUILD_NM)
+       fi
+
+       # Bug 491582.
+       export TMPDIR="${WORKDIR}/temp"
+       mkdir -p -m 755 "${TMPDIR}" || die
+
+       if ! use system-ffmpeg; then
+               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
+       fi
+
+       third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+       touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+       einfo "Configuring Chromium..."
+       if use gn; then
+               tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
+               out/Release/gn gen --args="${myconf_gn}" out/Release || die
+       else
+               build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
+               egyp_chromium ${myconf_gyp} || die
+       fi
+}
+
+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
+       use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+       # 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 out/Release/icudtl.dat || 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
+
+       # 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_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postrm() {
+       gnome2_icon_cache_update
+       xdg_desktop_database_update
+}
+
+pkg_postinst() {
+       gnome2_icon_cache_update
+       xdg_desktop_database_update
+       readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-gn-r3.patch b/www-client/chromium/files/chromium-gn-r3.patch
new file mode 100644 (file)
index 0000000..b29a6ae
--- /dev/null
@@ -0,0 +1,21 @@
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 9a3740e8..fa81d10 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -427,6 +427,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+       'base/profiler/scoped_tracker.cc',
+       'base/profiler/tracked_time.cc',
+       'base/run_loop.cc',
++      'base/sequence_token.cc',
+       'base/sequence_checker_impl.cc',
+       'base/sequenced_task_runner.cc',
+       'base/sha1.cc',
+@@ -439,7 +440,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+       'base/strings/stringprintf.cc',
+       'base/strings/utf_string_conversion_utils.cc',
+       'base/strings/utf_string_conversions.cc',
+-      'base/synchronization/cancellation_flag.cc',
++      'base/synchronization/atomic_flag.cc',
+       'base/synchronization/lock.cc',
+       'base/sys_info.cc',
+       'base/task_runner.cc',
diff --git a/www-client/chromium/files/chromium-last-commit-position-r1.patch b/www-client/chromium/files/chromium-last-commit-position-r1.patch
new file mode 100644 (file)
index 0000000..700a86e
--- /dev/null
@@ -0,0 +1,26 @@
+--- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000
++++ b/tools/gn/gn_main.cc      2015-11-12 11:50:14.780931485 +0000
+@@ -11,13 +11,7 @@
+ #include "tools/gn/standard_out.h"
+ #include "tools/gn/switches.h"
+ 
+-// Only the GN-generated build makes this header for now.
+-// TODO(brettw) consider adding this if we need it in GYP.
+-#if defined(GN_BUILD)
+-#include "tools/gn/last_commit_position.h"
+-#else
+ #define LAST_COMMIT_POSITION "UNKNOWN"
+-#endif
+ 
+ namespace {
+ 
+--- a/tools/gn/BUILD.gn.orig   2015-11-12 11:50:43.513524769 +0000
++++ b/tools/gn/BUILD.gn        2015-11-12 11:50:57.697817632 +0000
+@@ -227,7 +227,6 @@
+ 
+   deps = [
+     ":gn_lib",
+-    ":last_commit_position",
+     "//base",
+     "//build/config/sanitizers:deps",
+   ]
index 8be1735a297b10029e4c0636db1b2001d5607376..023dd2665fc40daf0a2a56389d5a45508168cff5 100644 (file)
  #include <libavformat/avio.h>
  #include <libavutil/avutil.h>
  #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1034,24 +1034,6 @@
-   // If no estimate is found, the stream entry will be kInfiniteDuration().
+--- a/media/filters/ffmpeg_demuxer.cc.orig     2016-08-01 10:52:01.528177808 +0000
++++ b/media/filters/ffmpeg_demuxer.cc  2016-08-01 10:52:27.160707694 +0000
+@@ -1150,24 +1150,6 @@
+   // If no estimate is found, the stream entry will be kInfiniteDuration.
    std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration());
+                                                     kInfiniteDuration);
 -  const AVFormatInternal* internal = format_context->internal;
 -  if (internal && internal->packet_buffer &&
 -      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
@@ -46,28 +44,5 @@ index 155e980..7ba327a 100644
 -    }
 -  }
  
+   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
    AVStream* audio_stream = NULL;
-   AudioDecoderConfig audio_config;
-Index: build/linux/unbundle/ffmpeg.gyp
-diff --git a/build/linux/unbundle/ffmpeg.gyp b/build/linux/unbundle/ffmpeg.gyp
-index e3c3723894ceae651920154dbb65cf83aa4d3d40..b86a1c4dc71c55d86a0bb66664f27cfe4f243fbc 100644
---- a/build/linux/unbundle/ffmpeg.gyp
-+++ b/build/linux/unbundle/ffmpeg.gyp
-@@ -41,6 +41,17 @@
-           'USE_SYSTEM_FFMPEG',
-         ],
-       },
-+      'variables': {
-+        'headers_root_path': '.',
-+        'header_filenames': [
-+          'libavcodec/avcodec.h',
-+          'libavformat/avformat.h',
-+          'libavutil/imgutils.h',
-+        ],
-+      },
-+      'includes': [
-+        '../../build/shim_headers.gypi',
-+      ],
-       'link_settings': {
-         'ldflags': [
-           '<!@(pkg-config --libs-only-L --libs-only-other libavcodec libavformat libavutil)',
diff --git a/www-client/chromium/files/chromium-system-jinja-r12.patch b/www-client/chromium/files/chromium-system-jinja-r12.patch
new file mode 100644 (file)
index 0000000..869cef9
--- /dev/null
@@ -0,0 +1,79 @@
+--- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig      2014-08-19 09:55:10.330972228 +0000
++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp   2014-08-19 09:55:26.387286232 +0000
+@@ -54,7 +54,6 @@
+     'actions': [{
+       'action_name': 'cache_jinja_templates',
+       'inputs': [
+-        '<@(jinja_module_files)',
+         'code_generator_v8.py',
+         '<@(code_generator_template_files)',
+       ],
+--- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig        2014-08-19 10:00:00.216521733 +0000
++++ b/third_party/WebKit/Source/build/scripts/scripts.gypi     2014-08-19 10:00:11.464735099 +0000
+@@ -2,10 +2,6 @@
+ {
+     'variables': {
+         'scripts_for_in_files': [
+-            # jinja2/__init__.py contains version string, so sufficient as
+-            # dependency for whole jinja2 package
+-            '<(DEPTH)/third_party/jinja2/__init__.py',
+-            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+             'hasher.py',
+             'in_file.py',
+             'in_generator.py',
+--- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig     2014-08-19 10:53:02.824618979 +0000
++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi  2014-08-19 10:53:20.784957370 +0000
+@@ -12,9 +12,6 @@
+       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+     ],
+     'idl_lexer_parser_files': [
+-      # PLY (Python Lex-Yacc)
+-      '<(DEPTH)/third_party/ply/lex.py',
+-      '<(DEPTH)/third_party/ply/yacc.py',
+       # Web IDL lexer/parser (base parser)
+       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+       '<(DEPTH)/tools/idl_parser/idl_node.py',
+--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
++++ b/third_party/WebKit/Source/build/scripts/scripts.gni      2016-06-02 09:54:50.966612510 +0000
+@@ -9,10 +9,6 @@
+ _scripts_dir = "//third_party/WebKit/Source/build/scripts"
+ 
+ scripts_for_in_files = [
+-  # jinja2/__init__.py contains version string, so sufficient as
+-  # dependency for whole jinja2 package
+-  "//third_party/jinja2/__init__.py",
+-  "//third_party/markupsafe/__init__.py",  # jinja2 dep
+   "$_scripts_dir/hasher.py",
+   "$_scripts_dir/in_file.py",
+   "$_scripts_dir/in_generator.py",
+--- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000
++++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn      2016-06-02 10:03:13.240907715 +0000
+@@ -36,7 +36,7 @@
+ action("cached_jinja_templates") {
+   script = "code_generator_v8.py"
+ 
+-  inputs = jinja_module_files + [ "code_generator_v8.py" ] +
++  inputs = [ "code_generator_v8.py" ] +
+            code_generator_template_files
+ 
+   # Dummy file to track dependency.
+--- a/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig    2016-06-03 12:31:49.844954196 +0000
++++ b/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp 2016-06-03 12:32:01.869198425 +0000
+@@ -60,7 +60,6 @@
+         {
+           'action_name': 'generateV8InspectorProtocolBackendSources',
+           'inputs': [
+-            '<@(jinja_module_files)',
+             # The python script in action below.
+             '../inspector_protocol/CodeGenerator.py',
+             # Input files for the script.
+--- a/third_party/WebKit/Source/core/inspector/inspector.gyp.orig      2016-06-03 12:38:20.712891692 +0000
++++ b/third_party/WebKit/Source/core/inspector/inspector.gyp   2016-06-03 12:38:31.197104557 +0000
+@@ -52,7 +52,6 @@
+         {
+           'action_name': 'generateInspectorProtocolBackendSources',
+           'inputs': [
+-            '<@(jinja_module_files)',
+             # The python script in action below.
+             '../../platform/inspector_protocol/CodeGenerator.py',
+             # Input files for the script.