From dde86b8f3578675d62527804cf2d5d39d402e310 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 14 Dec 2019 10:29:17 +0000 Subject: chromium: update to 79.0.3945.79 --- chromium/build/chromium.SlackBuild | 60 ++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index 29906c5d..d74e233f 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -425,6 +425,9 @@ # 78.0.3904.108-1: # 19/nov/2019 by Eric Hameleers # * Security update. +# 79.0.3945.79-1: +# 11/dec/2019 by Eric Hameleers +# * Security update. # # ----------------------------------------------------------------------------- # @@ -437,7 +440,7 @@ SRCNAM=chromium SRCEXT=${SRCEXT:-""} # could be "-dev" for development build PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev -VERSION=${VERSION:-78.0.3904.108} +VERSION=${VERSION:-79.0.3945.79} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -683,12 +686,6 @@ cd ${SRCNAM}-${VERSION} # Patches: touch $OUTPUT/patch-${PRGNAM}.log -# Missing include in blink: -cat $SRCDIR/patches/chromium_missing-include-for-unique_ptr.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log -# Fix crash on exit, see https://crbug.com/1005244 -cat $SRCDIR/patches/chromium_shutdown-crash.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Reduce log spam in console, see https://crbug.com/1005508 cat $SRCDIR/patches/chromium_fontmatching-logspam.patch | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log @@ -712,9 +709,9 @@ if [ $FFMPEG_HEVC -eq 1 ]; then # Add essential proprietary codecs to the "chrome" branding of ffmpeg: cat $SRCDIR/patches/chromium_ffmpeg_prop.patch | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log - # Advertize HEVC/X.265 support: - cat $SRCDIR/patches/chromium_hevc_supported.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log + ## Advertize HEVC/X.265 support (won't work at the moment): + #cat $SRCDIR/patches/chromium_hevc_supported.patch | patch -p1 --verbose \ + # 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log fi ## Enable VAAPI hardware decoding on Linux platform: #cat $SRCDIR/patches/chromium_vaapi.patch | patch -p1 --verbose \ @@ -762,8 +759,12 @@ if [ $USE_CDM -eq 1 ]; then #sed -e 's/assert(!enable_widevine || is_win || is_mac || is_chromecast/& || is_linux/' \ # -i third_party/widevine/cdm/BUILD.gn # From M71 we need to change another #define: - sed 's/BUILDFLAG(BUNDLE_WIDEVINE_CDM)/BUILDFLAG(ENABLE_WIDEVINE)/' \ - -i chrome/common/chrome_content_client.cc + #sed 's/BUILDFLAG(BUNDLE_WIDEVINE_CDM)/BUILDFLAG(ENABLE_WIDEVINE)/' \ + # -i chrome/common/chrome_content_client.cc + # From M79 we need to change this again, Chromium is supposed to download + # the CDM now but actually it does not work: + sed 's/BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm/BUNDLE_WIDEVINE_CDM=true/' \ + -i third_party/widevine/cdm/BUILD.gn fi if [ "x$SRCEXT" = "x-dev" ]; then @@ -803,12 +804,15 @@ export PATH="$TMP/tmp-$PRGNAM/privatebin:$PATH" _chromium_conf=( "clang_use_chrome_plugins=${do_clang}" 'enable_hangout_services_extension=true' - "enable_hevc_demuxing=${do_hevc}" 'enable_hidpi=true' "enable_hotwording=${do_hotword}" "enable_nacl=${do_nacl}" "enable_nacl_nonsfi=${do_nacl}" 'enable_pepper_cdms=true' + "enable_platform_hevc=${do_hevc}" + 'enable_platform_ac3_eac3_audio=true' + 'enable_platform_mpeg_h_audio=true' + 'enable_platform_dolby_vision=true' 'enable_precompiled_headers=false' 'enable_swiftshader=false' 'enable_webrtc=true' @@ -987,8 +991,17 @@ fi # Generate the ninja build files: echo "-- Bootstrapping 'gn'." + +# Symlink ld to lld to make gn linking stage succeed: +cd $MYCLANG_PATH ; ln -s lld ld ; cd - 1>/dev/null + LDFLAGS="$LDFLAGS" python2 tools/gn/bootstrap/bootstrap.py \ + --use-custom-libcxx \ 2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log + +# Remove symlink again: +rm $MYCLANG_PATH/ld + echo "-- Generating ninja build files." out/Release/gn gen out/Release -v --args="${_chromium_conf[*]}" \ --script-executable=/usr/bin/python2 \ @@ -1032,18 +1045,28 @@ install -D -m4755 -o root -g root out/Release/chrome_sandbox \ # (automated testing of web apps): install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver +# Copy libraries: +for CRLIB in {libEGL,libGLESv2,libVkICD_mock_icd,libvk_swiftshader}.so + do + install -D -m0755 -o root -g root out/Release/$CRLIB \ + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/$CRLIB +done + # Copy over the remaining binaries: +cp -a \ + out/Release/{swiftshader,MEIPreload,angledata} \ + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/ cp -a \ out/Release/*.pak \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/ if [ -f out/Release/libffmpeg*.so ]; then cp -a \ - out/Release/lib*.so* \ + out/Release/libffmpeg*.so* \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/ elif [ -f out/Release/lib/libffmpeg.so ]; then mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/ cp -a \ - out/Release/lib/lib*.so* \ + out/Release/lib/libffmpeg.so* \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/ fi if [ -f out/Release/natives_blob.bin ]; then @@ -1063,10 +1086,9 @@ fi strip --strip-unneeded \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{${PRGNAM},chrome-sandbox} \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver -if [ -f $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpeg*.so ]; then - strip --strip-unneeded \ - $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib*.so -elif [ -f $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/libffmpeg*.so ]; then +strip --strip-unneeded \ + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/*.so +if [ -f $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/libffmpeg*.so ]; then strip --strip-unneeded \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/lib*.so fi -- cgit v1.2.3