commit: 941e5d23654a9bcf3613a92b2eef6089c6bbf18a
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 20:28:14 2016 +0000
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Sun May 15 20:28:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941e5d23
www-client/chromium: reconfigure bundled ffmpeg when using GN
Package-Manager: portage-2.2.26
www-client/chromium/chromium-52.0.2723.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/chromium/chromium-52.0.2723.2.ebuild
b/www-client/chromium/chromium-52.0.2723.2.ebuild
index a3c00fc..980a401 100644
--- a/www-client/chromium/chromium-52.0.2723.2.ebuild
+++ b/www-client/chromium/chromium-52.0.2723.2.ebuild
@@ -447,6 +447,7 @@ src_configure() {
ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
myconf_gyp+=" -Dproprietary_codecs=1
-Dffmpeg_branding=${ffmpeg_branding}"
+ myconf_gn+=" proprietary_codecs=true
ffmpeg_branding=\"${ffmpeg_branding}\""
# Set up Google API keys, see
http://www.chromium.org/developers/how-tos/api-keys .
# Note: these are for Gentoo use ONLY. For your own distribution,
@@ -538,8 +539,7 @@ src_configure() {
export TMPDIR="${WORKDIR}/temp"
mkdir -p -m 755 "${TMPDIR}" || die
- # TODO: also do this for GN bundled ffmpeg build.
- if ! use system-ffmpeg && ! use gn; then
+ if ! use system-ffmpeg; then
local build_ffmpeg_args=""
if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
build_ffmpeg_args+=" --disable-asm"
