commit:     d68f62dac22d0158765f43613469174377254a81
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 14:53:35 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 14:53:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68f62da

www-client/chromium: fix proprietary-codecs logic

Bug: https://bugs.gentoo.org/593434#c13

Package-Manager: portage-2.3.0_p43

 www-client/chromium/chromium-54.0.2840.34.ebuild | 3 ++-
 www-client/chromium/chromium-55.0.2859.0.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/www-client/chromium/chromium-54.0.2840.34.ebuild 
b/www-client/chromium/chromium-54.0.2840.34.ebuild
index 89048ea..8063646 100644
--- a/www-client/chromium/chromium-54.0.2840.34.ebuild
+++ b/www-client/chromium/chromium-54.0.2840.34.ebuild
@@ -455,7 +455,8 @@ 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}\""
+       myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+       myconf_gn+=" 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,

diff --git a/www-client/chromium/chromium-55.0.2859.0.ebuild 
b/www-client/chromium/chromium-55.0.2859.0.ebuild
index 7dc37fe..8997a37 100644
--- a/www-client/chromium/chromium-55.0.2859.0.ebuild
+++ b/www-client/chromium/chromium-55.0.2859.0.ebuild
@@ -455,7 +455,8 @@ 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}\""
+       myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+       myconf_gn+=" 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,

Reply via email to