commit: a88a8ea88c3e2d4ea99cf2fab97329795f290ca8 Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 21:43:19 2015 +0000 Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> CommitDate: Sun Nov 29 21:44:50 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88a8ea8
www-client/chromium: dev channel bump (48.0.2564.10) Package-Manager: portage-2.2.20.1 www-client/chromium/Manifest | 3 +- www-client/chromium/chromium-48.0.2552.0.ebuild | 654 --------------------- ....2547.0.ebuild => chromium-48.0.2564.10.ebuild} | 168 +++--- www-client/chromium/files/chromium-rpath-r0.patch | 72 +++ .../chromium/files/chromium-system-ffmpeg-r1.patch | 50 ++ 5 files changed, 225 insertions(+), 722 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index ed6dd3a..2e2d528 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,6 +1,5 @@ DIST chromium-46.0.2490.86-lite.tar.xz 275908972 SHA256 bc8cc67e9b197e6aebe977b3af70ea57041c020c93a13264515a0dac81937bc6 SHA512 63a23aca030c86be8f12a16884b17e2c3e8c97fd580ea989e34465f9fa91378aeb11c6718e969e0a640e2a8cb0a8999b1ca003409a0436a84dfba500a58f0160 WHIRLPOOL 60a9d4bb5c62d3a781ef0ed0731782fc039a58d0e514cc2e17fb36fdd070894159c4aff7d3711471c2af56d401ef334feb2148eeb08da3601017cf3e6ac07522 DIST chromium-47.0.2526.49-lite.tar.xz 317398984 SHA256 32fe2246fc25542475c9702853eef9299f097ddeeea7700f275965189da8ac8f SHA512 8d927c564d39182ff35f3089164cfacee12a81d6e46cd349e114ba97ad5a8d807dc24873ef1eccef36a9a75f83a7bb83552d89da4cb6141933ce1e0c07187963 WHIRLPOOL a99a3abc6698bb32dfaff2674e816431178653187cebcfacfdf549bd862e93dcd47405f484d2784ead2be5fb722dff2c88eaaac2aeae2d35a55af4ab87ac1f11 DIST chromium-47.0.2526.58-lite.tar.xz 317393916 SHA256 86cf7abde8056ab22215f7651eaab29fc0c1dcbc9dfa57dd40409418b800551d SHA512 555fad79cbcd967ecf4b001d703c9fee3b9506e7e7cec9ad59a200ebb7cd39b75fc764d1a52662c328381b97cbf08438f521a04d6bffba48da1adc54b29597eb WHIRLPOOL e75ba2c6353ae24a0ae3175bec544404145ed66f602ea8d46671da7792645272f51e71a728ca3c398d1a35da651e8545a65e927cd4f1d5b418d9c1d72442ebb8 -DIST chromium-48.0.2547.0-lite.tar.xz 306282056 SHA256 cfbdce75bd8904d4a43d5bc7acc82481bfe840c17894294cb0b3d79c2386cee2 SHA512 706c7e6699b7e07a819d29c88a678c62507251cb08ccd4516e2ce847519a34356d49762037a3fefac8adff39f1f9b7c0a6284fa455ffccd98e6074d1ac346d1f WHIRLPOOL 7694f443375dfdc17c90fd4b6c603b210b5e34ad39cfbe93ee9bcdebf0d5600f389b5ffd54fd3438460ffa88e4d456ad20e5b0553582b8ce0389f2bd7c7e15f5 -DIST chromium-48.0.2552.0-lite.tar.xz 306545148 SHA256 ab72fd1e4ff9c2d2d8d931e12ba52395044cd136f1927c1cdb137fdef9dd0ad1 SHA512 1133d4670133ff9a18a2fbad08fcfb5cb2f28e9df092417ca17c0f5360767fa597eb85a0f55de7e2dc06e90a55068410da890664cc1bd071cc85631acebad16d WHIRLPOOL e13788bb8c21a06fc81c0bc2dfe03b13e19089eb8c59301c92666ec7745ac65a527f5a1179c9633194c63b562a2958154b0afc8c173e2a4db59eefada85580e0 DIST chromium-48.0.2560.0.tar.xz 395160400 SHA256 d2c1b9ad53dcaa08302d1dbfa74dc5d003c3c62ce1cd4b6eaf05d274d1af462b SHA512 422b09b0cfafc8761d6addb178b065a7de8f72d0c312b2288a991916536c06403a819b4ec6e3bc37ff0c2fd1ba8b8929f4e43b57a732a03bd5531208cc48e10f WHIRLPOOL 76bff863a212de3a74696e83924f9b5d4c70c045b9d309b0d25267458228761eee4505e2f5b93ac037358f14bc704a41ae03970c7f2ba96192a738fec611dae8 +DIST chromium-48.0.2564.10.tar.xz 432060420 SHA256 1902d75d49d46c32a8c33f6de53c9253a63a364b85eb4ada1e8a9ba7c0f523d0 SHA512 7753dc19a50c862211c10975b3ad64a0408e3645df7b0ea548f8437c4c5380ad0bb350920eb8c6791e0685ae7ec921c6be720e337a17dffe4b73c56b74a2bc9a WHIRLPOOL a9ccb2872ad639886288581e1c7d9244f16965ef924395531701289cc69c5a9dfdc4a25175151d27b150acc8e4398c8d91ca5f8f3e623c3c85c8b99d913c4f00 diff --git a/www-client/chromium/chromium-48.0.2552.0.ebuild b/www-client/chromium/chromium-48.0.2552.0.ebuild deleted file mode 100644 index 7c51aa4..0000000 --- a/www-client/chromium/chromium-48.0.2552.0.ebuild +++ /dev/null @@ -1,654 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_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}-lite.tar.xz"; - -LICENSE="BSD hotwording? ( no-source-code )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" -RESTRICT="!system-ffmpeg? ( 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:= - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - >=dev-libs/icu-55.1:= - >=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:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - sys-libs/zlib:=[minizip] - 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 )" -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" - -# 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[${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 "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \ - has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \ - has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \ - has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \ - has_version "dev-python/ply[${PYTHON_USEDEP}]" && \ - has_version "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 -" - -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() { - # if ! use arm; then - # mkdir -p out/Release/gen/sdk/toolchain || die - # # Do not preserve SELinux context, bug #460892 . - # cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \ - # out/Release/gen/sdk/toolchain/linux_x86_newlib || die - # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die - # fi - - epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch" - epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" - epatch "${FILESDIR}/chromium-widevine-r1.patch" - - epatch_user - - local conditional_bundled_libraries="" - if ! use system-ffmpeg; then - conditional_bundled_libraries+=" third_party/ffmpeg" - 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' \ - '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/boringssl' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - '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/components/polymer' \ - 'third_party/catapult/tracing/third_party/d3' \ - 'third_party/catapult/tracing/third_party/gl-matrix' \ - 'third_party/catapult/tracing/third_party/jszip' \ - '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/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/libXNVCtrl' \ - 'third_party/libaddressinput' \ - 'third_party/libjingle' \ - 'third_party/libphonenumber' \ - 'third_party/libsecret' \ - 'third_party/libsrtp' \ - 'third_party/libudev' \ - 'third_party/libusb' \ - 'third_party/libvpx_new' \ - 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ - 'third_party/libxml/chromium' \ - 'third_party/libwebm' \ - '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/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/zlib_v128' \ - 'third_party/polymer' \ - 'third_party/protobuf' \ - 'third_party/qcms' \ - '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/x86inc' \ - 'third_party/zlib/google' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/fdlibm' \ - '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_libusb (http://crbug.com/266149). - # TODO: use_system_libvpx (http://crbug.com/494939). - # 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_ffmpeg=$(usex system-ffmpeg 1 0) - -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 gtk3) - $(gyp_use hangouts enable_hangout_services_extension) - $(gyp_use hidpi enable_hidpi) - $(gyp_use hotwording enable_hotwording) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use tcmalloc use_allocator tcmalloc none) - $(gyp_use widevine enable_widevine)" - - # 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 [email protected] - # 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 - - # 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..." - 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 - 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 -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_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_print_elog -} diff --git a/www-client/chromium/chromium-48.0.2547.0.ebuild b/www-client/chromium/chromium-48.0.2564.10.ebuild similarity index 85% rename from www-client/chromium/chromium-48.0.2547.0.ebuild rename to www-client/chromium/chromium-48.0.2564.10.ebuild index 7c51aa4..534859a 100644 --- a/www-client/chromium/chromium-48.0.2547.0.ebuild +++ b/www-client/chromium/chromium-48.0.2564.10.ebuild @@ -14,14 +14,16 @@ inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-uti DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="http://chromium.org/"; -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"; +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"; LICENSE="BSD hotwording? ( no-source-code )" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" +IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" +REQUIRED_USE="gn? ( kerberos !system-ffmpeg )" + # Native Client binaries are compiled with different set of flags, bug #452066. QA_FLAGS_IGNORED=".*\.nexe" @@ -29,39 +31,27 @@ QA_FLAGS_IGNORED=".*\.nexe" # right tools for it, bug #469144 . QA_PRESTRIPPED=".*\.nexe" -RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= +RDEPEND=" app-arch/bzip2:= - app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= - >=dev-libs/icu-55.1:= >=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:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= - sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= @@ -81,7 +71,22 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= - kerberos? ( virtual/krb5 )" + kerberos? ( virtual/krb5 ) + !gn? ( + >=app-accessibility/speech-dispatcher-0.8:= + app-arch/snappy:= + >=dev-libs/icu-55.1:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + dev-libs/re2:= + media-libs/flac:= + media-libs/harfbuzz:=[icu(+)] + >=media-libs/libjpeg-turbo-1.2.0-r1:= + media-libs/libpng:0= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + )" DEPEND="${RDEPEND} !arm? ( dev-lang/yasm @@ -185,17 +190,12 @@ pkg_setup() { } src_prepare() { - # if ! use arm; then - # mkdir -p out/Release/gen/sdk/toolchain || die - # # Do not preserve SELinux context, bug #460892 . - # cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \ - # out/Release/gen/sdk/toolchain/linux_x86_newlib || die - # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die - # fi - - epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch" + epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch" epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" - epatch "${FILESDIR}/chromium-widevine-r1.patch" + epatch "${FILESDIR}/${PN}-widevine-r1.patch" + epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch" + epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch" + epatch "${FILESDIR}/${PN}-rpath-r0.patch" epatch_user @@ -203,6 +203,30 @@ src_prepare() { if ! use system-ffmpeg; then conditional_bundled_libraries+=" third_party/ffmpeg" fi + if use gn; then + conditional_bundled_libraries+=" + third_party/adobe + third_party/ffmpeg + third_party/flac + third_party/harfbuzz-ng + third_party/icu + third_party/jinja2 + third_party/libevent + third_party/libjpeg_turbo + third_party/libpng + third_party/libwebp + third_party/libxml + third_party/libxslt + third_party/markupsafe + third_party/re2 + third_party/snappy + third_party/speech-dispatcher + third_party/usb_ids + third_party/xdg-utils + third_party/yasm + third_party/zlib + " + fi # Remove most bundled libraries. Some are still needed. build/linux/unbundle/remove_bundled_libraries.py \ @@ -307,28 +331,23 @@ src_prepare() { } src_configure() { - local myconf="" + 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+=" -Ddisable_sse2=1" + myconf_gyp+=" -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" + 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+=" -Dflapper_version_h_file=${T}/flapper_version.h" + myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h" # Use system-provided libraries. # TODO: use_system_hunspell (upstream changes needed). @@ -339,7 +358,7 @@ src_configure() { # TODO: use_system_protobuf (bug #525560). # TODO: use_system_ssl (http://crbug.com/58087). # TODO: use_system_sqlite (http://crbug.com/22208). - myconf+=" + myconf_gyp+=" -Duse_system_bzip2=1 -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) -Duse_system_flac=1 @@ -361,17 +380,17 @@ src_configure() { -Duse_system_zlib=1" # Needed for system icu - we don't need additional data files. - myconf+=" -Dicu_use_data_file_flag=0" + myconf_gyp+=" -Dicu_use_data_file_flag=0" # TODO: patch gyp so that this arm conditional is not needed. if ! use arm; then - myconf+=" + myconf_gyp+=" -Duse_system_yasm=1" fi # Optional dependencies. # TODO: linux_link_kerberos, bug #381289. - myconf+=" + myconf_gyp+=" $(gyp_use cups) $(gyp_use gnome use_gconf) $(gyp_use gnome-keyring use_gnome_keyring) @@ -385,31 +404,35 @@ src_configure() { $(gyp_use tcmalloc use_allocator tcmalloc none) $(gyp_use widevine enable_widevine)" + myconf_gn+=" use_cups=$(usex cups true false)" + # Use explicit library dependencies instead of dlopen. # This makes breakages easier to detect by revdep-rebuild. - myconf+=" + myconf_gyp+=" -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+=" + myconf_gyp+=" -Dusb_ids_path=/usr/share/misc/usb.ids" # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf+=" + myconf_gyp+=" -Dlogging_like_official_build=1" if [[ $(tc-getCC) == *clang* ]]; then - myconf+=" -Dclang=1" + myconf_gyp+=" -Dclang=1" + myconf_gn+=" is_clang=true" else - myconf+=" -Dclang=0" + 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+=" + myconf_gyp+=" -Dclang_use_chrome_plugins=0 -Dhost_clang=0 -Dlinux_use_bundled_binutils=0 @@ -417,13 +440,13 @@ src_configure() { -Dlinux_use_gold_flags=0" ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" + myconf_gyp+=" -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 [email protected] # for more info. - myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" @@ -441,32 +464,33 @@ src_configure() { local CTARGET=${CTARGET:-${CHOST}} if [[ $(tc-is-softfloat) == "no" ]]; then - myconf+=" -Darm_float_abi=hard" + myconf_gyp+=" -Darm_float_abi=hard" fi filter-flags "-mfpu=*" - use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" + use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" if [[ ${CTARGET} == armv[78]* ]]; then - myconf+=" -Darmv7=1" + myconf_gyp+=" -Darmv7=1" else - myconf+=" -Darmv7=0" + myconf_gyp+=" -Darmv7=0" fi - myconf+=" -Dsysroot= + myconf_gyp+=" -Dsysroot= $(gyp_use neon arm_neon) -Ddisable_nacl=1" else die "Failed to determine target arch, got '$myarch'." fi - myconf+=" -Dtarget_arch=${target_arch}" + 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+=" -Dwerror=" + myconf_gyp+=" -Dwerror=" + myconf_gn+=" treat_warnings_as_errors=false" # Disable fatal linker warnings, bug 506268. - myconf+=" -Ddisable_fatal_linker_warnings=1" + myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" # Avoid CFLAGS problems, bug #352457, bug #390147. if ! use custom-cflags; then @@ -499,7 +523,8 @@ src_configure() { export TMPDIR="${WORKDIR}/temp" mkdir -p -m 755 "${TMPDIR}" || die - if ! use system-ffmpeg; then + # TODO: also do this for GN bundled ffmpeg build. + if ! use system-ffmpeg && ! use gn; then local build_ffmpeg_args="" if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then build_ffmpeg_args+=" --disable-asm" @@ -520,8 +545,13 @@ src_configure() { touch chrome/test/data/webui/i18n_process_css_test.html || die einfo "Configuring Chromium..." - build/linux/unbundle/replace_gyp_files.py ${myconf} || die - egyp_chromium ${myconf} || die + 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() { @@ -544,9 +574,11 @@ eninja() { 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 + if ! use gn; then + # Build mksnapshot and pax-mark it. + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + fi # Even though ninja autodetects number of CPUs, we respect # user's options, for debugging with -j 1 or any other reason. @@ -604,6 +636,10 @@ src_install() { doins out/Release/*.bin || die doins out/Release/*.pak || die + if use gn; then + doins out/Release/icudtl.dat || die + fi + doins -r out/Release/locales || die doins -r out/Release/resources || die diff --git a/www-client/chromium/files/chromium-rpath-r0.patch b/www-client/chromium/files/chromium-rpath-r0.patch new file mode 100644 index 0000000..244e012 --- /dev/null +++ b/www-client/chromium/files/chromium-rpath-r0.patch @@ -0,0 +1,72 @@ +Index: base/BUILD.gn +diff --git a/base/BUILD.gn b/base/BUILD.gn +index 9e4270d26009f853e37dc7af883bed4cb43705c8..7d67f62a688b0214bd3eb95a3cd4612bdd273b6d 100644 +--- a/base/BUILD.gn ++++ b/base/BUILD.gn +@@ -1562,11 +1562,18 @@ test("base_unittests") { + if (is_linux) { + sources -= [ "file_version_info_unittest.cc" ] + sources += [ "nix/xdg_util_unittest.cc" ] ++ + deps += [ "//base/test:malloc_wrapper" ] + + if (use_glib) { + configs += [ "//build/config/linux:glib" ] + } ++ ++ if (!is_component_build) { ++ # Set rpath so that we find libmalloc_wrapper.so ++ # even in a non-component build. ++ configs += [ "//build/config/gcc:rpath_link" ] ++ } + } + + if (!is_linux || use_ozone) { +Index: build/config/gcc/BUILD.gn +diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn +index b6ab1d4b96ba7ba9a39409006f949569551f92d2..9bc16d9e0d918096cec7124ccf20f145643824b8 100644 +--- a/build/config/gcc/BUILD.gn ++++ b/build/config/gcc/BUILD.gn +@@ -20,14 +20,8 @@ config("symbol_visibility_hidden") { + cflags = [ "-fvisibility=hidden" ] + } + +-# Settings for executables and shared libraries. +-config("executable_ldconfig") { +- if (is_android) { +- ldflags = [ +- "-Bdynamic", +- "-Wl,-z,nocopyreloc", +- ] +- } else { ++config("rpath_link") { ++ if (!is_android) { + # Note: Android doesn't support rpath. + rpath_link = "" + if (shlib_subdir != ".") { +@@ -37,7 +31,25 @@ config("executable_ldconfig") { + # Want to pass "\$". GN will re-escape as required for ninja. + "-Wl,-rpath=\$ORIGIN/${rpath_link}", + "-Wl,-rpath-link=${rpath_link}", ++ ] ++ } ++} + ++# Settings for executables and shared libraries. ++config("executable_ldconfig") { ++ if (is_android) { ++ ldflags = [ ++ "-Bdynamic", ++ "-Wl,-z,nocopyreloc", ++ ] ++ } else { ++ if (is_component_build) { ++ configs += [ ":rpath_link" ] ++ } ++ ++ ldflags = [ ++ # TODO(GYP): Do we need a check on the binutils version here? ++ # + # Newer binutils don't set DT_RPATH unless you disable "new" dtags + # and the new DT_RUNPATH doesn't work without --no-as-needed flag. + "-Wl,--disable-new-dtags", diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch b/www-client/chromium/files/chromium-system-ffmpeg-r1.patch new file mode 100644 index 0000000..c9f6ce0 --- /dev/null +++ b/www-client/chromium/files/chromium-system-ffmpeg-r1.patch @@ -0,0 +1,50 @@ +--- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000 ++++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000 +@@ -19,10 +19,6 @@ + + // Include FFmpeg header files. + extern "C" { +-// Disable deprecated features which result in spammy compile warnings. This +-// list of defines must mirror those in the 'defines' section of BUILD.gn file & +-// ffmpeg.gyp file or the headers below will generate different structures! +-#define FF_API_CONVERGENCE_DURATION 0 + // Upstream libavcodec/utils.c still uses the deprecated + // av_dup_packet(), causing deprecation warnings. + // The normal fix for such things is to disable the feature as below, +@@ -36,7 +32,6 @@ + MSVC_PUSH_DISABLE_WARNING(4244); + #include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> +-#include <libavformat/internal.h> + #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 +@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb, + // If no estimate is found, the stream entry will be kInfiniteDuration(). + std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, + kInfiniteDuration()); +- const AVFormatInternal* internal = format_context->internal; +- if (internal && internal->packet_buffer && +- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) { +- struct AVPacketList* packet_buffer = internal->packet_buffer; +- while (packet_buffer != internal->packet_buffer_end) { +- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), +- start_time_estimates.size()); +- const AVStream* stream = +- format_context->streams[packet_buffer->pkt.stream_index]; +- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) { +- const base::TimeDelta packet_pts = +- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); +- if (packet_pts < start_time_estimates[stream->index]) +- start_time_estimates[stream->index] = packet_pts; +- } +- packet_buffer = packet_buffer->next; +- } +- } + + AVStream* audio_stream = NULL; + AudioDecoderConfig audio_config;
