diff options
author | Eric Hameleers <alien@slackware.com> | 2018-01-29 10:26:00 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-01-29 10:26:00 +0000 |
commit | 5bb630fbdae1568569918beea70d5e09780359c5 (patch) | |
tree | b64439f3a0137c1f3f94b9891ba7141a195428ff /chromium | |
parent | 5e53c5b08dcd219c054acd8b4338bc3662daa9e1 (diff) | |
download | asb-5bb630fbdae1568569918beea70d5e09780359c5.tar.gz asb-5bb630fbdae1568569918beea70d5e09780359c5.tar.xz |
chromium: updated to 64.0.3282.119
Diffstat (limited to 'chromium')
-rwxr-xr-x | chromium/build/chromium.SlackBuild | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index 38a20a39..884cb04c 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -303,6 +303,9 @@ # 63.0.3239.132-1: # 07/jan/2018 by Eric Hameleers <alien@slackware.com> # * Update. +# 64.0.3282.119-1: +# 26/jan/2018 by Eric Hameleers <alien@slackware.com> +# * Update to 64. # # # ----------------------------------------------------------------------------- @@ -316,7 +319,7 @@ SRCNAM=chromium SRCEXT=${SRCEXT:-""} # could be "-dev" for development build PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev -VERSION=${VERSION:-63.0.3239.132} +VERSION=${VERSION:-64.0.3282.119} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -428,32 +431,35 @@ fi case "$ARCH" in i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" - RPMARCH="i386" DSSE="1" + FFMPEG_ARCH="ia32" ;; x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - RPMARCH="x86_64" #DSSE="0" DSSE="1" + FFMPEG_ARCH="x64" ;; armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" DSSE="1" # Widevine not supported (no binary library available): USE_CDM=0 + FFMPEG_ARCH="arm" ;; armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" SLKLDFLAGS=""; LIBDIRSUFFIX="" DSSE="1" # Widevine not supported (no binary library available): USE_CDM=0 + FFMPEG_ARCH="arm" ;; *) SLKCFLAGS=${SLKCFLAGS:-"O2"} SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} DSSE="1" # Widevine not supported by default: USE_CDM=0 + FFMPEG_ARCH="$ARCH" ;; esac @@ -532,8 +538,8 @@ cd ${SRCNAM}-${VERSION} # Patches: touch $OUTPUT/patch-${PRGNAM}.log -# Explicitly include math.h (patch borrowed from Gentoo): -cat $SRCDIR/patches/chromium_webrtc-r0.patch | patch -p1 --verbose \ +# Include string.h in Chromium's memcpy: +cat $SRCDIR/patches/chromium_memcpy-r0.patch | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # When compiling google's clang on 32bit Slackware use 'i586' in the triplet. # I am a python noob so this is clumsy, better implementation is welcome :-) @@ -563,7 +569,7 @@ sed -i tools/clang/scripts/update.py -e 's/^ *AddCMakeToPath/#&/' # DEPS file https://chromium.googlesource.com/chromium/src/+/master/DEPS: python2 build/util/lastchange.py \ --version-macro=GPU_LISTS_VERSION \ - --revision-only \ + --revision-id-only \ --header=gpu/config/gpu_lists_version.h # Explicitly use Python 2: @@ -637,7 +643,7 @@ _chromium_conf=( "enable_widevine=${do_cdm}" 'exclude_unwind_tables=true' 'fatal_linker_warnings=false' - 'ffmpeg_branding="Chrome"' + 'ffmpeg_branding="ChromeOS"' "ffmpeg_component=\"${USE_FFMPEG}_library\"" 'fieldtrial_testing_like_official_build=true' "google_api_key=\"$_google_api_key\"" @@ -751,6 +757,20 @@ if [ ${USE_CLANG} -eq 1 -o ${USE_NACL} -eq 1 ]; then 2>&1 | tee $OUTPUT/clang_build-${PRGNAM}.log fi +# Re-configure bundled ffmpeg to make it compile on 32bit Slackware: +if [ "${FFMPEG_ARCH}" = "ia32" ]; then + echo "Configuring bundled ffmpeg..." + cd third_party/ffmpeg + python2 chromium/scripts/build_ffmpeg.py linux ${FFMPEG_ARCH} \ + --branding ChromeOS -- --disable-asm \ + 2>&1 | tee $OUTPUT/ffmpeg_configure-${PRGNAM}.log + ./chromium/scripts/copy_config.sh \ + 2>&1 | tee -a $OUTPUT/ffmpeg_configure-${PRGNAM}.log + ./chromium/scripts/generate_gn.py \ + 2>&1 | tee -a $OUTPUT/ffmpeg_configure-${PRGNAM}.log + cd - 2>/dev/null +fi + # Generate the ninja build files: echo "-- Bootstrapping 'gn'." python2 tools/gn/bootstrap/bootstrap.py \ |