summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2018-07-29 20:48:00 -0400
committerMike Gilbert <floppym@gentoo.org>2018-07-29 20:48:00 -0400
commit6566f88191b9ac3b62feddba03d36f48bad2468b (patch)
tree66cadc02f5bc134b57fb8cc519150e59ed8ba320 /www-client
parentkernel-2.eclass: inherit estack eclass (diff)
downloadgentoo-6566f88191b9ac3b62feddba03d36f48bad2468b.tar.gz
gentoo-6566f88191b9ac3b62feddba03d36f48bad2468b.tar.bz2
gentoo-6566f88191b9ac3b62feddba03d36f48bad2468b.zip
www-client/chromium: dev channel bump (69.0.3497.12)
Package-Manager: Portage-2.3.43_p8, Repoman-2.3.10_p7
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-69.0.3497.12.ebuild (renamed from www-client/chromium/chromium-69.0.3464.0.ebuild)29
2 files changed, 7 insertions, 24 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 68429fa2a3b8..bdca129bffac 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@ DIST chromium-67.0.3396.87.tar.xz 591491608 BLAKE2B 9069c4b2e000e180a9b21bbdbb67
DIST chromium-67.0.3396.99.tar.xz 592170796 BLAKE2B c214f2feb911bd375849f1c69a67dad797111107be7d8c7b99f503e67a62212c0340c8c21b1922cf0a5bfdc32507dfe337a9cddeb29674067c08e6e21a8585a5 SHA512 b1cc7f5988d30efae0b3954232a402e2906bb27113f453a67d865a79afecf6a124c7833635d6083ea40f0cb7344e3cdb4a02f3b8ba4b1cd9798b5d2bccb23242
DIST chromium-68.0.3440.68.tar.xz 630241852 BLAKE2B c18ed31b87c8617f5776a63a4e7c816bf1ef5974ce74a662ba8bb35dde2aac7b4b1c23c52b4b6530d5998e0cc4cb42bcf88f07acbe8e4fc550257cfab536b86f SHA512 ca1458bd93425c77420ee991c6f9ab2624d9ae14dc457468146b0cecee097eb73bee8ee6c623aac67e8425713bde15f015094c96085086c084d924f5f25383c0
DIST chromium-68.0.3440.75.tar.xz 630277224 BLAKE2B 87c152c14333007223f611acb56360b553c5a4a97026f9cf4ca37d90aa501aabe5e294c3bacbd537c7602fc5dcb010a493c8d64b2881681ddfaad66cd58a3c56 SHA512 99ab36c9a9c224469f3a34f0193b0b4662b626ac29d23711716117cc6fa437717c2c3357f8a95adf9085b94a262c8b4c46727f88bf50bb231bb85af956afbedb
-DIST chromium-69.0.3464.0.tar.xz 634891812 BLAKE2B 2cff114b4c6af03d3a6bc79df68876d38d9d8cc972faed2d3d0a3c565911fb2d32e467a4cff1ca8d5c234fece983ab1bb1b5be12bfdc1041d823fde645050f7e SHA512 d14414be553faa9d327dbb9348edcbc755f7f8346825c5144e65a25acb21eec07c34713180ed5701830ccadda99c171e279ae40a620c9babd187d0d093c8a87b
DIST chromium-69.0.3493.3.tar.xz 622878800 BLAKE2B 46aabdf4032471db8c6b461ebce6cfbc4fe99be55b959134c950bbba63d2c303673f48bb10004698f79abd4e22aa8b8c390ff6a12210020cf6bd8cf6cf8d8060 SHA512 96393f8939fccc8514094f9215496883f416669e61feb45b706610f67ff90672a88f9154fb06e59dec9d363c5e9a072bf1f2ba562dd533345a493664dabcb19e
+DIST chromium-69.0.3497.12.tar.xz 618608916 BLAKE2B 08090979f0e78e4e0cfc5b638bfd4a3b94479f824d279dd3fe269ac8ce3d6820f5d56dabef76763f9e5d6ab335a84f9173db600c2c7060db66ed8462d6a57c24 SHA512 0eae307df50efb872271e395541e5434ab0cfbd4d1db66fec4ac0578ca228f391deb4e70ffa3af2adf26618b22961978d06692b39d20037a1da41512258e3c55
diff --git a/www-client/chromium/chromium-69.0.3464.0.ebuild b/www-client/chromium/chromium-69.0.3497.12.ebuild
index 51df6a8dbe61..0d11a59cf6d1 100644
--- a/www-client/chromium/chromium-69.0.3464.0.ebuild
+++ b/www-client/chromium/chromium-69.0.3497.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
@@ -80,6 +80,7 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
!=www-client/chromium-9999
!<www-plugins/chrome-binary-plugins-57
+ dev-util/gn
x11-misc/xdg-utils
virtual/opengl
virtual/ttf-fonts
@@ -130,14 +131,13 @@ GTK+ icon theme.
"
PATCHES=(
+ "${FILESDIR}/chromium-compiler-r4.patch"
"${FILESDIR}/chromium-widevine-r2.patch"
- "${FILESDIR}/chromium-compiler-r3.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-disable_xml_catalogs.patch"
+ "${FILESDIR}/chromium-ffmpeg-ebp-r1.patch"
)
pre_build_checks() {
@@ -269,6 +269,7 @@ src_prepare() {
third_party/libXNVCtrl
third_party/libaddressinput
third_party/libaom
+ third_party/libaom/source/libaom/third_party/vector
third_party/libaom/source/libaom/third_party/x86inc
third_party/libjingle
third_party/libphonenumber
@@ -364,22 +365,6 @@ src_prepare() {
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
}
-bootstrap_gn() {
- if tc-is-cross-compiler; then
- local -x AR=${BUILD_AR}
- local -x CC=${BUILD_CC}
- local -x CXX=${BUILD_CXX}
- local -x NM=${BUILD_NM}
- local -x CFLAGS=${BUILD_CFLAGS}
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- einfo "Building GN..."
- set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
- echo "$@"
- "$@" || die
-}
-
src_configure() {
# Calling this here supports resumption via FEATURES=keepwork
python_setup
@@ -572,10 +557,8 @@ src_configure() {
popd > /dev/null || die
fi
- bootstrap_gn
-
einfo "Configuring Chromium..."
- set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+ set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
echo "$@"
"$@" || die
}