| 1 |
commit: 94162f26984e7785a618acfb894349ebb47fd5cf |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 31 20:19:25 2017 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 31 20:19:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94162f26 |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump (60.0.3112.7) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 11 |
|
| 12 |
www-client/chromium/Manifest | 2 +- |
| 13 |
...omium-60.0.3100.0.ebuild => chromium-60.0.3112.7.ebuild} | 11 ++++------- |
| 14 |
www-client/chromium/files/chromium-gn-bootstrap-r8.patch | 13 +++++++++++++ |
| 15 |
3 files changed, 18 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 18 |
index 31e8a2a0f35..2b73ee05ed7 100644 |
| 19 |
--- a/www-client/chromium/Manifest |
| 20 |
+++ b/www-client/chromium/Manifest |
| 21 |
@@ -2,5 +2,5 @@ DIST chromium-58.0.3029.110.tar.xz 518167664 SHA256 f24cef3dd2acf9dd5ccdeeca47fe |
| 22 |
DIST chromium-58.0.3029.81.tar.xz 509252204 SHA256 5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb SHA512 49e8a641e6fe839880ac4cc17aa4b79875dbd0e14adcf7ad0138730334555fd57c93c1e7ebdf6f03c61528c351a5a489f56fb7d7809aef268627b186c547a4f3 WHIRLPOOL eed9d97cd4cb4d9a56864e65e797f6d126327d6e9371bdfe416fd57f0f4c9c83f37e125798a1753b5d8bc5921036bdfe064b3d7e94c3ba315a710241a6c5b179 |
| 23 |
DIST chromium-59.0.3071.47.tar.xz 531847280 SHA256 d431b463e8a6c194d5b5dbee0c664aec8d1d87a2cc17b4237eca2b37d3698ab5 SHA512 98a608248ee9948cf34e9e5cbeb735515354cbfd869b5a773dda6c25d3351b1a7c289a85c0fb0f37340a4f54e02f8b38e54e14455eb58a6a7040596e0d7c50cf WHIRLPOOL f136b13c97ce1589f8acd26c45cd9fc21d68960532b52c9826e44dbff6e9d1350bc0bf5f63e0b9a205e409b6c381ca3f5762b826db928555ca424664e7bdfe45 |
| 24 |
DIST chromium-59.0.3071.61.tar.xz 531774216 SHA256 3471d957fb550288327b395d8fe36225ccf0334bb80bb276f313e5eafabc8422 SHA512 292ea900774ec3b1d20de621f7b4a1fefa8ab1b9e7246876f62701e152b9dbed4739b8a9e79787a829f8662a699114c9bb0d63e79f93c24361763f35d76e7d2f WHIRLPOOL 4cbd3110a5a7403ed1c60ee47f6c97ef13f8c70b87fe9892c786fe18cd2c2738b1bac426a234e766fdd08f3c24f7bb2a2d3cf958b5af882d2cdf7821e67a7750 |
| 25 |
-DIST chromium-60.0.3100.0.tar.xz 533255016 SHA256 5e03a5a9146bc1efefe3246d79eef9341a12429fb54e952633e2a62e374ad944 SHA512 ba795ec89c0f7bad7a27d5c7917081ec526f4ae0379b3cd993fc94c2feb2b75eb93d6ad8b1eb2925ebc68ff400dc5ec8bb94b795d02894a969cfb7fd91868685 WHIRLPOOL 9c7ccde4fb0aadc7f626e162af8d0c4752d075c50c163dc19679a8d747bf7d3aba3f7907f4b2592c01b0bbfd251e30e5be1aa77c12598e0c3ed4603111aa888f |
| 26 |
DIST chromium-60.0.3107.4.tar.xz 533329508 SHA256 d49fd97a882eea329168a7d036e1ffee031fe62f42379c821138b8e6c204c091 SHA512 0c2e6a2496105f026f8d4cf42c5eabfac1f513385c8ace9070f1c9a7ebbcd62190d30857a7f9cc8aed3e590a57816029e04813a7876d47f00ea0e1302f5a8556 WHIRLPOOL c01f9763df6a0a4a5f61f4acb7d67b040901b24d0c26a02dd8ff5e6b110d51833927f19824f347e3adbbf6b27f476ca35949fd50d5bc7779a9646db9bd30dc74 |
| 27 |
+DIST chromium-60.0.3112.7.tar.xz 537210676 SHA256 9bed6c54d4e44aef40a013cf4e7a5dcde57a1bc75d628cf0d7bbe3f8614c228d SHA512 27f7d7a97ba8fd9bb17a0abfed2934bbfba60947d5380578bb3ce43e5634e3153df5cecd76fb27291206722e7647e50717e6f45c98ebb6a33ef7e1f9d6e9e344 WHIRLPOOL 0718a8ee323c6a947068b3bcf59dae822f5b969c1bcc10024d58b23436e5513be3c9fe3632e9226c11232b4f8ec49b31044e2408316317b7d329682b9531b977 |
| 28 |
|
| 29 |
diff --git a/www-client/chromium/chromium-60.0.3100.0.ebuild b/www-client/chromium/chromium-60.0.3112.7.ebuild |
| 30 |
similarity index 98% |
| 31 |
rename from www-client/chromium/chromium-60.0.3100.0.ebuild |
| 32 |
rename to www-client/chromium/chromium-60.0.3112.7.ebuild |
| 33 |
index 3d2bc0139c0..20b237d4b70 100644 |
| 34 |
--- a/www-client/chromium/chromium-60.0.3100.0.ebuild |
| 35 |
+++ b/www-client/chromium/chromium-60.0.3112.7.ebuild |
| 36 |
@@ -45,6 +45,7 @@ COMMON_DEPEND=" |
| 37 |
media-libs/libjpeg-turbo:= |
| 38 |
media-libs/libpng:= |
| 39 |
system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
| 40 |
+ media-libs/openh264:= |
| 41 |
media-libs/opus:= |
| 42 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 43 |
system-ffmpeg? ( >=media-video/ffmpeg-3:= ) |
| 44 |
@@ -185,11 +186,7 @@ src_prepare() { |
| 45 |
local PATCHES=( |
| 46 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
| 47 |
"${FILESDIR}/${PN}-FORTIFY_SOURCE-r1.patch" |
| 48 |
- "${FILESDIR}/skia-avx2.patch" |
| 49 |
- "${FILESDIR}/${PN}-system-ffmpeg-r6.patch" |
| 50 |
- "${FILESDIR}/${PN}-system-opus-r1.patch" |
| 51 |
- "${FILESDIR}/${PN}-system-libpng-r1.patch" |
| 52 |
- "${FILESDIR}/${PN}-system-libwebp-r1.patch" |
| 53 |
+ "${FILESDIR}/${PN}-gn-bootstrap-r8.patch" |
| 54 |
) |
| 55 |
|
| 56 |
default |
| 57 |
@@ -273,7 +270,6 @@ src_prepare() { |
| 58 |
third_party/mt19937ar |
| 59 |
third_party/node |
| 60 |
third_party/node/node_modules/vulcanize/third_party/UglifyJS2 |
| 61 |
- third_party/openh264 |
| 62 |
third_party/openmax_dl |
| 63 |
third_party/ots |
| 64 |
third_party/pdfium |
| 65 |
@@ -300,7 +296,6 @@ src_prepare() { |
| 66 |
third_party/sqlite |
| 67 |
third_party/swiftshader |
| 68 |
third_party/swiftshader/third_party/llvm-subzero |
| 69 |
- third_party/swiftshader/third_party/pnacl-subzero |
| 70 |
third_party/swiftshader/third_party/subzero |
| 71 |
third_party/tcmalloc |
| 72 |
third_party/usrsctp |
| 73 |
@@ -352,6 +347,7 @@ src_configure() { |
| 74 |
myconf_gn+=" enable_nacl=false" |
| 75 |
|
| 76 |
# Use system-provided libraries. |
| 77 |
+ # TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). |
| 78 |
# TODO: use_system_hunspell (upstream changes needed). |
| 79 |
# TODO: use_system_libsrtp (bug #459932). |
| 80 |
# TODO: xml (bug #616818). |
| 81 |
@@ -369,6 +365,7 @@ src_configure() { |
| 82 |
libpng |
| 83 |
libwebp |
| 84 |
libxslt |
| 85 |
+ openh264 |
| 86 |
opus |
| 87 |
re2 |
| 88 |
snappy |
| 89 |
|
| 90 |
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r8.patch b/www-client/chromium/files/chromium-gn-bootstrap-r8.patch |
| 91 |
new file mode 100644 |
| 92 |
index 00000000000..d9f389aaf58 |
| 93 |
--- /dev/null |
| 94 |
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r8.patch |
| 95 |
@@ -0,0 +1,13 @@ |
| 96 |
+Index: tools/gn/bootstrap/bootstrap.py |
| 97 |
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py |
| 98 |
+index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 |
| 99 |
+--- a/tools/gn/bootstrap/bootstrap.py |
| 100 |
++++ b/tools/gn/bootstrap/bootstrap.py |
| 101 |
+@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 102 |
+ 'base/sys_info.cc', |
| 103 |
+ 'base/task_runner.cc', |
| 104 |
+ 'base/task_scheduler/delayed_task_manager.cc', |
| 105 |
++ 'base/task_scheduler/environment_config.cc', |
| 106 |
+ 'base/task_scheduler/post_task.cc', |
| 107 |
+ 'base/task_scheduler/priority_queue.cc', |
| 108 |
+ 'base/task_scheduler/scheduler_lock_impl.cc', |
Archives