commit: c5ef3a4ebbd0f313b937288691447992bf842147 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Feb 9 17:06:28 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Feb 9 17:06:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ef3a4e
www-client/chromium: fix bundled ffmpeg configure script Closes: https://bugs.gentoo.org/646658 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 www-client/chromium/chromium-64.0.3282.140.ebuild | 1 + www-client/chromium/chromium-65.0.3315.3.ebuild | 1 + www-client/chromium/files/chromium-ffmpeg-r0.patch | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/www-client/chromium/chromium-64.0.3282.140.ebuild b/www-client/chromium/chromium-64.0.3282.140.ebuild index f9d0c892ec1..1f79ba7bd6f 100644 --- a/www-client/chromium/chromium-64.0.3282.140.ebuild +++ b/www-client/chromium/chromium-64.0.3282.140.ebuild @@ -151,6 +151,7 @@ PATCHES=( "${FILESDIR}/chromium-cups-r0.patch" "${FILESDIR}/chromium-clang-r2.patch" "${FILESDIR}/chromium-angle-r0.patch" + "${FILESDIR}/chromium-ffmpeg-r0.patch" ) pre_build_checks() { diff --git a/www-client/chromium/chromium-65.0.3315.3.ebuild b/www-client/chromium/chromium-65.0.3315.3.ebuild index b8011501a83..c2d2f2fcaf7 100644 --- a/www-client/chromium/chromium-65.0.3315.3.ebuild +++ b/www-client/chromium/chromium-65.0.3315.3.ebuild @@ -152,6 +152,7 @@ PATCHES=( "${FILESDIR}/chromium-gn-r0.patch" "${FILESDIR}/chromium-vulkan-r0.patch" "${FILESDIR}/chromium-gcc-r0.patch" + "${FILESDIR}/chromium-ffmpeg-r0.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-ffmpeg-r0.patch b/www-client/chromium/files/chromium-ffmpeg-r0.patch new file mode 100644 index 00000000000..40632235bab --- /dev/null +++ b/www-client/chromium/files/chromium-ffmpeg-r0.patch @@ -0,0 +1,21 @@ +--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py ++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py +@@ -632,18 +632,8 @@ + 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'] 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':
