www-client/chromium: reconfigure bundled ffmpeg when using GN
authorPawel Hajdan, Jr <phajdan.jr@gentoo.org>
Sun, 15 May 2016 20:28:14 +0000 (22:28 +0200)
committerPawel Hajdan, Jr <phajdan.jr@gentoo.org>
Sun, 15 May 2016 20:28:14 +0000 (22:28 +0200)
Package-Manager: portage-2.2.26

www-client/chromium/chromium-52.0.2723.2.ebuild

index a3c00fc4a814937bb4d859a0bbe1bd07f917fae2..980a40198efdd8891e5c7c4689ef0b121ebde900 100644 (file)
@@ -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"