gentoo resync : 08.05.2018

3 files changed, 221 insertions, 2 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index acce158afd69..0d0399265a10 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,6 +4,7 @@ AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1
 AUX chromium-clang-r4.patch 363 BLAKE2B 4c776d4823eef90f69bb42b1fc2ed5c314fcb60cdc2da44d90bd3faf6d9a9d3fdf8367a85f6e735b59fe440f7de5582a974b3e04f4ff46683242f368e68b1503 SHA512 78fa7d69b2b8bdd5a755baff7d5474943ad373d2cc9673db61f501b0f8150bbdf795b3c2afa557d637564276dd5b4edda282daa7cbb7b5ea9366bd81f8989ab0
 AUX chromium-compiler-r0.patch 5681 BLAKE2B d56abb6f816cfb530e583b5e59c7719f766ed0ce198f1caf3043cde38115fabb8f776f57946abf57f7430259ac0bb7c7c44602198d9a5e1f3ac942c4f1da366f SHA512 01a799b1ae1dd4042fffb0307207089c99d568289e20677ff7436767da9ee16cc6491f759d0b7447b59b53d44cbd235053078aa7dfdfcbc66eb9cd2d73ab8857
 AUX chromium-compiler-r1.patch 5859 BLAKE2B 6a96e586c0f38e949544d8d5a756b92a08107ea41de3c62d1c8c38173c67ae8c08a2b9207947b78048ca0dd7d731c60c2ac34a7e72facc340ff876cd42f91d0e SHA512 01303f0d134edeb1bac5a1c2e95b7e66997b218fcd8af8aa53860a48d0f4adff000b90a9e12a55eb11dbb163ac4f1926e010b194a6d9b75b62598040c6fcbfb0
+AUX chromium-ffmpeg-build-r0.patch 8657 BLAKE2B 08bddd7f6ca4379ec2fddeda91a1bb709a4be1c26dd869e1e21ac2576cede1c28531b0ad40bc8a6abb74212fa9cf2dbe1c05bb20cf0b9730918c71bda47c0779 SHA512 5014564446305d9e594de8bf51483a29b25c7e2f8d4bb858419669bdaae5ba60cef55c8e0d2b4236a58b2be0f8762bd588089b6face98e763e6e5f8f78801f17
 AUX chromium-ffmpeg-clang.patch 840 BLAKE2B cd0af6414462be4ee0cbb46e0c43b705f6883ed42a536747a5ab5a9a6c52727c521aca92bce61b55cf68be6dbac665a41846fd8907335e1dd34b452f973b624e SHA512 e02bc169ef60af8f48b67ed36a7f0e1232fcfc2c59fd48de5cc6c0a267fe29eccd7971a2692ce07c34cf07d5bf416389e10442bf2658822b3fbd27dd623ea91a
 AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0
 AUX chromium-gn-bootstrap-r23.patch 1943 BLAKE2B ca68059bf799dcc8fdd7ab698008e55a2c5707168c72b463ffd66a73f97df8ff5689fa5d440d60b519ac3ed6739a1b95ce5ed8f294e473d065a7bb2a35bb4267 SHA512 0af208a257ff3ce3f61b242e05ee4988a371c3d9ee5c686fdc15b023283b1914272c4e30562a48c294fa47f665b5082e274f44f871c97afc6c849b6065f9deec
@@ -21,5 +22,5 @@ DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c
 EBUILD chromium-66.0.3359.139.ebuild 21055 BLAKE2B c74cd0f0c8a50c99879aa82b87f6802239f3f56c462baabd4d3c4c618f90cf96ff7787fa13bdff63305dc60183f709ec727663bbe83bc0a0c662bbac52be1b5d SHA512 d51c2d8323ec5fd507d53e7ce2ecc2eaea83448a592d8bf7e36b30db315e85572cd00dbe8a26e12b11fa7cc47ab46121fab7c42179a60c0143794b4d2aec92e7
 EBUILD chromium-67.0.3396.18.ebuild 20774 BLAKE2B 85841d5b0afc8d0661ba32f0375c10b76d22228782c45790b6978d454d7304d758d111be11aa93a18bb74bf7fd4636d9463a7d56c608305df03a82cb13a7a378 SHA512 06d5090324b77677d4e22f3c5b7e515f05c7df7ad8112ac901ce6962f121d997ca1dc9c706bc3c1c11f1bf791dce8887cb7faf4be6041e1e5092d0aac4cf4ad3
 EBUILD chromium-67.0.3396.30.ebuild 20774 BLAKE2B 85841d5b0afc8d0661ba32f0375c10b76d22228782c45790b6978d454d7304d758d111be11aa93a18bb74bf7fd4636d9463a7d56c608305df03a82cb13a7a378 SHA512 06d5090324b77677d4e22f3c5b7e515f05c7df7ad8112ac901ce6962f121d997ca1dc9c706bc3c1c11f1bf791dce8887cb7faf4be6041e1e5092d0aac4cf4ad3
-EBUILD chromium-68.0.3409.2.ebuild 20929 BLAKE2B ee7048d1c022427f86621912ef3d801d7188168e07d0c371da05f0fe871245f76aea41d5ec04e0f9adeeb2e7ad3dd886f267a7bd58652fc9771dda8912f7b1e2 SHA512 793b12dd3631baedac8eac7ef568fa969ae6ab5b870eae23fd4212f9f0e3c9ae9f04873b2a10b1f9bd73d8a6968457fe558a204faec30dc8bf6bc7d2901cf8c3
+EBUILD chromium-68.0.3409.2.ebuild 20932 BLAKE2B b35334258b4776b1a15d35108d1737797b87ffd00c3718700ccef00d89d32a44427b0e44d8a053ead0fe2d806bfcd5473665e141f4171508a592946950d322df SHA512 dd405771880cb839ad4fa6a7fdfc0efb55fd6061e9fb75af2953b2b26f15cfb57f90438f59cc3baae3796fb63be13aad8bdd599f6966e82bb05ac12dcbd03241
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-68.0.3409.2.ebuild b/www-client/chromium/chromium-68.0.3409.2.ebuild
index bc37e0d7109f..86da01dec685 100644
--- a/www-client/chromium/chromium-68.0.3409.2.ebuild
+++ b/www-client/chromium/chromium-68.0.3409.2.ebuild
@@ -145,12 +145,12 @@ GTK+ icon theme.
 
 PATCHES=(
 	"${FILESDIR}/chromium-compiler-r1.patch"
+	"${FILESDIR}/chromium-ffmpeg-build-r0.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
 	"${FILESDIR}/chromium-math.h-r0.patch"
 	"${FILESDIR}/chromium-stdint.patch"
 	"${FILESDIR}/chromium-ffmpeg-r1.patch"
-	"${FILESDIR}/chromium-ffmpeg-clang.patch"
 	"${FILESDIR}/chromium-gn-bootstrap-r23.patch"
 )
 
diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
new file mode 100644
index 000000000000..5d9d0d26ecd5
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
@@ -0,0 +1,218 @@
+From 92b5903a360931a7ba335fc10ae2e0802652326b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 6 May 2018 13:13:37 -0400
+Subject: [PATCH] Remove arch-specic code from build_ffmpeg.py
+
+---
+ chromium/scripts/build_ffmpeg.py | 185 -------------------------------
+ 1 file changed, 185 deletions(-)
+
+diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py
+index aa1fc54755..d7d8878db6 100755
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -534,201 +534,16 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs,
+     configure_flags['Common'].extend(SetupAndroidToolchain(target_arch))
+   else:
+     configure_flags['Common'].extend([
+-        # --optflags doesn't append multiple entries, so set all at once.
+-        '--optflags="-O2"',
+         '--enable-decoder=theora,vp8',
+         '--enable-parser=vp3,vp8',
+     ])
+ 
+-  if target_os in ('linux', 'linux-noasm', 'android'):
+-    if target_arch == 'x64':
+-      if target_os == 'android':
+-        configure_flags['Common'].extend([
+-            '--arch=x86_64',
+-        ])
+-      if target_os != 'android':
+-        configure_flags['Common'].extend(['--enable-lto'])
+-      pass
+-    elif target_arch == 'ia32':
+-      configure_flags['Common'].extend([
+-          '--arch=i686',
+-          '--extra-cflags="-m32"',
+-          '--extra-ldflags="-m32"',
+-      ])
+-      # Android ia32 can't handle textrels and ffmpeg can't compile without
+-      # them.  http://crbug.com/559379
+-      if target_os == 'android':
+-        configure_flags['Common'].extend([
+-            '--disable-x86asm',
+-        ])
+-    elif target_arch == 'arm' or target_arch == 'arm-neon':
+-      # TODO(ihf): ARM compile flags are tricky. The final options
+-      # overriding everything live in chroot /build/*/etc/make.conf
+-      # (some of them coming from src/overlays/overlay-<BOARD>/make.conf).
+-      # We try to follow these here closely. In particular we need to
+-      # set ffmpeg internal #defines to conform to make.conf.
+-      # TODO(ihf): For now it is not clear if thumb or arm settings would be
+-      # faster. I ran experiments in other contexts and performance seemed
+-      # to be close and compiler version dependent. In practice thumb builds are
+-      # much smaller than optimized arm builds, hence we go with the global
+-      # CrOS settings.
+-      configure_flags['Common'].extend([
+-          '--arch=arm',
+-          '--enable-armv6',
+-          '--enable-armv6t2',
+-          '--enable-vfp',
+-          '--enable-thumb',
+-          '--extra-cflags=-march=armv7-a',
+-      ])
+-
+-      if target_os == 'android':
+-        configure_flags['Common'].extend([
+-            # Runtime neon detection requires /proc/cpuinfo access, so ensure
+-            # av_get_cpu_flags() is run outside of the sandbox when enabled.
+-            '--enable-neon',
+-            '--extra-cflags=-mtune=generic-armv7-a',
+-            # Enabling softfp lets us choose either softfp or hardfp when doing
+-            # the chrome build.
+-            '--extra-cflags=-mfloat-abi=softfp',
+-        ])
+-        if target_arch == 'arm':
+-          print('arm-neon is the only supported arm arch for Android.\n')
+-          return 1
+-
+-        if target_arch == 'arm-neon':
+-          configure_flags['Common'].extend([
+-              '--extra-cflags=-mfpu=neon',
+-          ])
+-        else:
+-          configure_flags['Common'].extend([
+-              '--extra-cflags=-mfpu=vfpv3-d16',
+-          ])
+-      else:
+-        if host_arch != 'arm':
+-          configure_flags['Common'].extend([
+-              '--enable-cross-compile',
+-              '--target-os=linux',
+-              '--extra-cflags=--target=arm-linux-gnueabihf',
+-              '--extra-ldflags=--target=arm-linux-gnueabihf',
+-              '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR,
+-                                          'build/linux/debian_sid_arm-sysroot'),
+-              '--extra-cflags=-mtune=cortex-a8',
+-              # NOTE: we don't need softfp for this hardware.
+-              '--extra-cflags=-mfloat-abi=hard',
+-              # For some reason configure drops this...
+-              '--extra-cflags=-O2',
+-          ])
+-
+-        if target_arch == 'arm-neon':
+-          configure_flags['Common'].extend([
+-              '--enable-neon',
+-              '--extra-cflags=-mfpu=neon',
+-          ])
+-        else:
+-          configure_flags['Common'].extend([
+-              '--disable-neon',
+-              '--extra-cflags=-mfpu=vfpv3-d16',
+-          ])
+-    elif target_arch == 'arm64':
+-      if target_os != 'android':
+-        configure_flags['Common'].extend([
+-            '--enable-cross-compile',
+-            '--cross-prefix=/usr/bin/aarch64-linux-gnu-',
+-            '--target-os=linux',
+-            '--extra-cflags=--target=aarch64-linux-gnu',
+-            '--extra-ldflags=--target=aarch64-linux-gnu',
+-            '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR,
+-                                        'build/linux/debian_sid_arm64-sysroot'),
+-        ])
+-      configure_flags['Common'].extend([
+-          '--arch=aarch64',
+-          '--enable-armv8',
+-          '--extra-cflags=-march=armv8-a',
+-      ])
+-    elif target_arch == 'mipsel':
+-      # These flags taken from android chrome build with target_cpu='mipsel'
+-      configure_flags['Common'].extend([
+-          '--arch=mipsel',
+-          '--disable-mips32r6',
+-          '--disable-mips32r5',
+-          '--disable-mips32r2',
+-          '--disable-mipsdsp',
+-          '--disable-mipsdspr2',
+-          '--disable-msa',
+-          '--enable-mipsfpu',
+-          '--extra-cflags=-march=mipsel',
+-          '--extra-cflags=-mcpu=mips32',
+-          # Required to avoid errors about dynamic relocation w/o -fPIC.
+-          '--extra-ldflags=-z notext',
+-      ])
+-      if target_os == 'linux':
+-        configure_flags['Common'].extend([
+-            '--enable-cross-compile',
+-            '--target-os=linux',
+-            '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR,
+-                                        'build/linux/debian_sid_mips-sysroot'),
+-            '--extra-cflags=--target=mipsel-linux-gnu',
+-            '--extra-ldflags=--target=mipsel-linux-gnu',
+-        ])
+-    elif target_arch == 'mips64el':
+-      # These flags taken from android chrome build with target_cpu='mips64el'
+-      configure_flags['Common'].extend([
+-          '--arch=mips64el',
+-          '--enable-mipsfpu',
+-          '--disable-mipsdsp',
+-          '--disable-mipsdspr2',
+-          '--extra-cflags=-march=mips64el',
+-          # Required to avoid errors about dynamic relocation w/o -fPIC.
+-          '--extra-ldflags=-z notext',
+-      ])
+-      if target_os == 'android':
+-        configure_flags['Common'].extend([
+-            '--enable-mips64r6',
+-            '--extra-cflags=-mcpu=mips64r6',
+-            '--disable-mips64r2',
+-            '--enable-msa',
+-        ])
+-      if target_os == 'linux':
+-        configure_flags['Common'].extend([
+-            '--enable-cross-compile',
+-            '--target-os=linux',
+-            '--sysroot=' + os.path.join(
+-                CHROMIUM_ROOT_DIR, 'build/linux/debian_sid_mips64el-sysroot'),
+-            '--enable-mips64r2',
+-            '--disable-mips64r6',
+-            '--disable-msa',
+-            '--extra-cflags=-mcpu=mips64r2',
+-            '--extra-cflags=--target=mips64el-linux-gnuabi64',
+-            '--extra-ldflags=--target=mips64el-linux-gnuabi64',
+-        ])
+-    else:
+-      print(
+-          'Error: Unknown target arch %r for target OS %r!' % (target_arch,
+-                                                               target_os),
+-          file=sys.stderr)
+-      return 1
+-
+   if target_os == 'linux-noasm':
+     configure_flags['Common'].extend([
+         '--disable-asm',
+         '--disable-inline-asm',
+     ])
+ 
+-  if 'win' not in target_os:
+-    configure_flags['Common'].extend([
+-        '--enable-pic',
+-        '--cc=clang',
+-        '--cxx=clang++',
+-        '--ld=clang',
+-    ])
+-
+-    # Clang Linux will use the first 'ld' it finds on the path, which will
+-    # typically be the system one, so explicitly configure use of Clang's
+-    # ld.lld, to ensure that things like cross-compilation and LTO work.
+-    # This does not work for arm64, ia32 and is always used on mac.
+-    if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac':
+-      configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
+-
+   # Should be run on Mac.
+   if target_os == 'mac':
+     if host_os != 'mac':
+-- 
+2.17.0
+