| 1 |
commit: c5ef3a4ebbd0f313b937288691447992bf842147 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 9 17:06:28 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 9 17:06:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ef3a4e |
| 7 |
|
| 8 |
www-client/chromium: fix bundled ffmpeg configure script |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/646658 |
| 11 |
Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 |
| 12 |
|
| 13 |
www-client/chromium/chromium-64.0.3282.140.ebuild | 1 + |
| 14 |
www-client/chromium/chromium-65.0.3315.3.ebuild | 1 + |
| 15 |
www-client/chromium/files/chromium-ffmpeg-r0.patch | 21 +++++++++++++++++++++ |
| 16 |
3 files changed, 23 insertions(+) |
| 17 |
|
| 18 |
diff --git a/www-client/chromium/chromium-64.0.3282.140.ebuild b/www-client/chromium/chromium-64.0.3282.140.ebuild |
| 19 |
index f9d0c892ec1..1f79ba7bd6f 100644 |
| 20 |
--- a/www-client/chromium/chromium-64.0.3282.140.ebuild |
| 21 |
+++ b/www-client/chromium/chromium-64.0.3282.140.ebuild |
| 22 |
@@ -151,6 +151,7 @@ PATCHES=( |
| 23 |
"${FILESDIR}/chromium-cups-r0.patch" |
| 24 |
"${FILESDIR}/chromium-clang-r2.patch" |
| 25 |
"${FILESDIR}/chromium-angle-r0.patch" |
| 26 |
+ "${FILESDIR}/chromium-ffmpeg-r0.patch" |
| 27 |
) |
| 28 |
|
| 29 |
pre_build_checks() { |
| 30 |
|
| 31 |
diff --git a/www-client/chromium/chromium-65.0.3315.3.ebuild b/www-client/chromium/chromium-65.0.3315.3.ebuild |
| 32 |
index b8011501a83..c2d2f2fcaf7 100644 |
| 33 |
--- a/www-client/chromium/chromium-65.0.3315.3.ebuild |
| 34 |
+++ b/www-client/chromium/chromium-65.0.3315.3.ebuild |
| 35 |
@@ -152,6 +152,7 @@ PATCHES=( |
| 36 |
"${FILESDIR}/chromium-gn-r0.patch" |
| 37 |
"${FILESDIR}/chromium-vulkan-r0.patch" |
| 38 |
"${FILESDIR}/chromium-gcc-r0.patch" |
| 39 |
+ "${FILESDIR}/chromium-ffmpeg-r0.patch" |
| 40 |
) |
| 41 |
|
| 42 |
pre_build_checks() { |
| 43 |
|
| 44 |
diff --git a/www-client/chromium/files/chromium-ffmpeg-r0.patch b/www-client/chromium/files/chromium-ffmpeg-r0.patch |
| 45 |
new file mode 100644 |
| 46 |
index 00000000000..40632235bab |
| 47 |
--- /dev/null |
| 48 |
+++ b/www-client/chromium/files/chromium-ffmpeg-r0.patch |
| 49 |
@@ -0,0 +1,21 @@ |
| 50 |
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py |
| 51 |
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py |
| 52 |
+@@ -632,18 +632,8 @@ |
| 53 |
+ if 'win' not in target_os: |
| 54 |
+ configure_flags['Common'].extend([ |
| 55 |
+ '--enable-pic', |
| 56 |
+- '--cc=clang', |
| 57 |
+- '--cxx=clang++', |
| 58 |
+- '--ld=clang', |
| 59 |
+ ]) |
| 60 |
+ |
| 61 |
+- # Clang Linux will use the first 'ld' it finds on the path, which will |
| 62 |
+- # typically be the system one, so explicitly configure use of Clang's |
| 63 |
+- # ld.lld, to ensure that things like cross-compilation and LTO work. |
| 64 |
+- # This does not work for arm64, ia32 and is always used on mac. |
| 65 |
+- if target_arch not in ['arm64', 'ia32'] and target_os != 'mac': |
| 66 |
+- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld') |
| 67 |
+- |
| 68 |
+ # Should be run on Mac. |
| 69 |
+ if target_os == 'mac': |
| 70 |
+ if host_os != 'mac': |
Archives