summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-11-21 03:40:13 +0000
committerMike Gilbert <floppym@gentoo.org>2013-11-21 03:40:13 +0000
commitd6c6dc90fc849fa981d55fe4bf1b680f8ca2d304 (patch)
treef6062d92737891be3a4faf1cc4e26e197f44c485 /www-client/chromium
parentVersion bump. (diff)
downloadgentoo-2-d6c6dc90fc849fa981d55fe4bf1b680f8ca2d304.tar.gz
gentoo-2-d6c6dc90fc849fa981d55fe4bf1b680f8ca2d304.tar.bz2
gentoo-2-d6c6dc90fc849fa981d55fe4bf1b680f8ca2d304.zip
Beta channel bump.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-32.0.1700.19.ebuild (renamed from www-client/chromium/chromium-32.0.1700.6.ebuild)12
2 files changed, 17 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f6ed8aeb5cc2..642568bab7d1 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.989 2013/11/20 21:34:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.990 2013/11/21 03:40:12 floppym Exp $
+
+*chromium-32.0.1700.19 (21 Nov 2013)
+
+ 21 Nov 2013; Mike Gilbert <floppym@gentoo.org> +chromium-32.0.1700.19.ebuild,
+ -chromium-32.0.1700.6.ebuild:
+ Beta channel bump.
*chromium-33.0.1711.3 (20 Nov 2013)
diff --git a/www-client/chromium/chromium-32.0.1700.6.ebuild b/www-client/chromium/chromium-32.0.1700.19.ebuild
index c131a1d786af..333b14bee387 100644
--- a/www-client/chromium/chromium-32.0.1700.6.ebuild
+++ b/www-client/chromium/chromium-32.0.1700.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.6.ebuild,v 1.3 2013/11/15 04:09:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v 1.1 2013/11/21 03:40:12 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -153,7 +153,7 @@ src_prepare() {
# fi
epatch "${FILESDIR}/${PN}-system-jinja-r2.patch"
- epatch "${FILESDIR}/${PN}-blink-crash-r0.patch"
+ epatch "${FILESDIR}/${PN}-build_ffmpeg-r0.patch"
epatch_user
@@ -396,6 +396,14 @@ src_configure() {
export CXX_host=$(tc-getBUILD_CXX)
export LD_host=${CXX_host}
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+ einfo "Configuring bundled ffmpeg..."
+ pushd third_party/ffmpeg > /dev/null || die
+ chromium/scripts/build_ffmpeg.sh linux ${target_arch} "${PWD}" config-only || die
+ chromium/scripts/copy_config.sh || die
+ popd > /dev/null || die
+
+ einfo "Configuring Chromium..."
build/linux/unbundle/replace_gyp_files.py ${myconf} || die
egyp_chromium ${myconf} || die
}