summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-60.0.3095.5.ebuild (renamed from www-client/chromium/chromium-60.0.3080.5.ebuild)23
2 files changed, 15 insertions, 10 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e422e841280e..c1e8751e8949 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
DIST chromium-58.0.3029.81.tar.xz 509252204 SHA256 5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb SHA512 49e8a641e6fe839880ac4cc17aa4b79875dbd0e14adcf7ad0138730334555fd57c93c1e7ebdf6f03c61528c351a5a489f56fb7d7809aef268627b186c547a4f3 WHIRLPOOL eed9d97cd4cb4d9a56864e65e797f6d126327d6e9371bdfe416fd57f0f4c9c83f37e125798a1753b5d8bc5921036bdfe064b3d7e94c3ba315a710241a6c5b179
DIST chromium-59.0.3071.36.tar.xz 531792008 SHA256 1c62e16d47969897c1dda97e12c14646d3504dd191c6175d92c1fde57ac1a79a SHA512 c97d599f37fbdf9b6966861b2b1b016c68bfdd702bb9967152dee374500f9ca9b3eb6fe4bb00640c71c0217257b7912c6b7bc8b8b0713685282b3708643e2b7e WHIRLPOOL cdf10735423c04a54685abd8d8c210b4999691a86b4fc826c30f190e69a12e32edb83ccbe1e6bf173d76d6638b587acd9b85deec27ca912d69fb2e3a53a41b2b
DIST chromium-59.0.3071.47.tar.xz 531847280 SHA256 d431b463e8a6c194d5b5dbee0c664aec8d1d87a2cc17b4237eca2b37d3698ab5 SHA512 98a608248ee9948cf34e9e5cbeb735515354cbfd869b5a773dda6c25d3351b1a7c289a85c0fb0f37340a4f54e02f8b38e54e14455eb58a6a7040596e0d7c50cf WHIRLPOOL f136b13c97ce1589f8acd26c45cd9fc21d68960532b52c9826e44dbff6e9d1350bc0bf5f63e0b9a205e409b6c381ca3f5762b826db928555ca424664e7bdfe45
-DIST chromium-60.0.3080.5.tar.xz 529799584 SHA256 7d6cc16eba14b4417b02f8533707b6ea910574402b2f92463f831eb7c19eb536 SHA512 da4ad6820d080549c694d5ef2cdaf380004f19630c4caf3c5cdb73863685751cc278c81f846d30c3ebee1be4608dad3cfe1598af31f10b4e6c47bffab4c91431 WHIRLPOOL b9f48d1fccf7914463572d857cb0e552d3178114a20d4f83d486037d9b55c3277a2f93c6fea245d136ae5b59a14a8bf0c1bc923e4395e5619a043ef0655601ec
DIST chromium-60.0.3088.3.tar.xz 530979712 SHA256 f47aa0f8a3a1280f1df548a31a0560f32f205716bbd4b72866c101a78842fc1f SHA512 a80684d8b941fe6c91cd3b9d558f1a8b6a61ee1292424d5c2ca67d8e8b46df2291d4f95f40d02e393a83ea0f3e3f99274e8a86473e8c1c7702ace50ad26e79f9 WHIRLPOOL 227045a6c130ddd12b0bef00e7886e8435cb58e988e02a6320f0ba32f8c78203de88ad31df0fc2ef80e9c5f88449513e5fd6fd6279dd360070c94830038a6859
+DIST chromium-60.0.3095.5.tar.xz 532742216 SHA256 6835717ae34e0722dee36a5a633dea10a6dd31ebba1748031981c08a46a27d16 SHA512 be9a3edd3c3b3d72e0bf443cdcd93eb160b5016b783167c8545999cab536eb644ab86e4cb71e49d7fbcb7037024962e0e18bd94a843cf0b978d2ad86ffa17dbe WHIRLPOOL 4851cb67ef8e3584b313d9f66afb2678c7b481c779e8aded8ca6e1b7fee2ada4e167f3316a86dd478c48968236708b120e9a35650767fd8d046b6691e306f564
diff --git a/www-client/chromium/chromium-60.0.3080.5.ebuild b/www-client/chromium/chromium-60.0.3095.5.ebuild
index 6081cb18f334..b8b9b00cc706 100644
--- a/www-client/chromium/chromium-60.0.3080.5.ebuild
+++ b/www-client/chromium/chromium-60.0.3095.5.ebuild
@@ -46,6 +46,7 @@ COMMON_DEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:=
system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+ media-libs/opus:=
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( >=media-video/ffmpeg-3:= )
sys-apps/dbus:=
@@ -144,10 +145,6 @@ GTK+ icon theme.
pre_build_checks() {
if [[ ${MERGE_TYPE} != binary ]]; then
local -x CPP="$(tc-getCXX) -E"
- if tc-is-gcc; then
- # https://bugs.chromium.org/p/chromium/issues/detail?id=714412
- die "GCC build is currently broken; please use clang instead (CC=clang CXX=clang++)"
- fi
if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
# bugs: #601654
die "At least clang 3.9.1 is required"
@@ -190,10 +187,8 @@ src_prepare() {
"${FILESDIR}/${PN}-widevine-r1.patch"
"${FILESDIR}/${PN}-FORTIFY_SOURCE.patch"
"${FILESDIR}/skia-avx2.patch"
- "${FILESDIR}/${PN}-dma-buf-r2.patch"
"${FILESDIR}/${PN}-system-ffmpeg-r6.patch"
- "${FILESDIR}/${PN}-gn-bootstrap-r5.patch"
- "${FILESDIR}/${PN}-clang-r1.patch"
+ "${FILESDIR}/${PN}-system-opus-r1.patch"
)
default
@@ -247,9 +242,11 @@ src_prepare() {
third_party/flatbuffers
third_party/flot
third_party/freetype
+ third_party/glslang-angle
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/googletest
third_party/hunspell
third_party/iccjpeg
third_party/inspector_protocol
@@ -278,7 +275,6 @@ src_prepare() {
third_party/node/node_modules/vulcanize/third_party/UglifyJS2
third_party/openh264
third_party/openmax_dl
- third_party/opus
third_party/ots
third_party/pdfium
third_party/pdfium/third_party/agg23
@@ -297,13 +293,19 @@ src_prepare() {
third_party/qcms
third_party/sfntly
third_party/skia
+ third_party/skia/third_party/vulkan
third_party/smhasher
+ third_party/spirv-headers
+ third_party/spirv-tools-angle
third_party/sqlite
third_party/swiftshader
third_party/swiftshader/third_party/llvm-subzero
third_party/swiftshader/third_party/pnacl-subzero
+ third_party/swiftshader/third_party/subzero
third_party/tcmalloc
third_party/usrsctp
+ third_party/vulkan
+ third_party/vulkan-validation-layers
third_party/web-animations-js
third_party/webdriver
third_party/webrtc
@@ -354,7 +356,6 @@ src_configure() {
# TODO: use_system_libsrtp (bug #459932).
# TODO: use_system_libusb (http://crbug.com/266149).
# TODO: xml (bug #616818).
- # 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).
@@ -369,6 +370,7 @@ src_configure() {
libpng
libwebp
libxslt
+ opus
re2
snappy
yasm
@@ -599,6 +601,9 @@ src_install() {
doins -r out/Release/locales
doins -r out/Release/resources
+ insinto "${CHROMIUM_HOME}/swiftshader"
+ doins out/Release/swiftshader/*.so
+
newman out/Release/chrome.1 chromium.1
newman out/Release/chrome.1 chromium-browser.1