commit baa2c18de5d5f99acab5c1cfec3a5ccad08da90f Merge: 6453812 06cf3b0 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Sat Sep 21 22:56:38 2019 +0200 Merge remote-tracking branch 'fedora/master' .gitignore | 69 +-- chromium-77.0.3865.75-base-gcc-no-alignas.patch | 12 + chromium-77.0.3865.75-boolfix.patch | 24 + ...ium-77.0.3865.75-certificate-transparency.patch | 539 +++++++++++++++++++++ chromium-77.0.3865.75-el7-noexcept.patch | 165 +++++++ chromium-77.0.3865.75-fedora-user-agent.patch | 12 + chromium-77.0.3865.75-gcc-abstract-class.patch | 61 +++ chromium-77.0.3865.75-gcc-include-memory.patch | 12 + chromium-77.0.3865.75-gcc-no-opt-safe-math.patch | 15 + chromium-77.0.3865.75-gcc5-r3.patch | 36 ++ chromium-77.0.3865.75-harfbuzz-subset.patch | 49 ++ chromium-77.0.3865.75-missing-limits.patch | 28 ++ chromium-77.0.3865.75-no-zlib-mangle.patch | 22 + chromium-77.0.3865.75-unbundle-zlib.patch | 25 + chromium-latest.py | 94 ++-- chromium-libs-media-freeworld.spec | 200 ++++---- clean_ffmpeg.sh | 1 + sources | 2 +- 18 files changed, 1157 insertions(+), 209 deletions(-) --- diff --cc chromium-libs-media-freeworld.spec index c04dc59,7a0d711..3f257c5 --- a/chromium-libs-media-freeworld.spec +++ b/chromium-libs-media-freeworld.spec @@@ -164,10 -175,10 +175,10 @@@ BuildRequires: libicu-devel >= 5. %global chromoting_client_id %nil %endif - %global majorversion 76 + %global majorversion 77 %if %{freeworld} -Name: chromium%{chromium_channel}%{?freeworld:-freeworld} +Name: chromium%{chromium_channel}-libs-media%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif @@@ -1437,12 -1430,12 +1430,15 @@@ tools/gn/bootstrap/bootstrap.py -v "$CH # do not need to do headless gen %else %if %{build_headless} - %{target}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_HEADLESS_GN_DEFINES" %{headlesstarget} + %{builddir}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_HEADLESS_GN_DEFINES" %{headlessbuilddir} + %endif %endif +%endif + +%{target}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{remotingtarget} + %{builddir}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{remotingbuilddir} + %if %{bundlelibusbx} # no hackity hack hack %else