[chromium-libs-media-freeworld: 4/5] Merge branch 'master' of https://src.fedoraproject.org/rpms/chromium

commit ebfd506c5a4aaf3ada5bc34e0bd8ff13b4f97c9d Merge: 7a6afff a776f11 Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; Date: Sun Nov 3 11:15:10 2019 +0530 Merge branch 'master' of https://src.fedoraproject.org/rpms/chromium chromium-77.0.3865.75-el7-noexcept.patch | 165 -------------------------- chromium-78.0.3904.70-el7-noexcept.patch | 194 +++++++++++++++++++++++++++++++ chromium-libs-media-freeworld.spec | 78 +++++++++---- 3 files changed, 249 insertions(+), 188 deletions(-) --- diff --cc chromium-libs-media-freeworld.spec index 6811c7b,d7c8d25..3aec64d --- a/chromium-libs-media-freeworld.spec +++ b/chromium-libs-media-freeworld.spec @@@ -22,12 -22,22 +22,22 @@@ # We'd like to always have this on. %global use_vaapi 0 + # If we build with shared on, then chrome-remote-desktop depends on chromium libs. + # If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build) + %global shared 1 + # NEVER EVER EVER turn this on in official builds -%global freeworld 0 +%global freeworld 1 %if %{freeworld} %global lsuffix freeworld + %if 0%{?shared} + %global nsuffix -libs-media-freeworld + %else + %global nsuffix -freeworld + %endif %else %global lsuffix fedora + %global nsuffix %{nil} %endif # Some people wish not to use the Fedora Google API keys. Mmkay.