diff --git a/tur-continuous/chromium/build.sh b/tur-continuous/chromium/build.sh index f89d50956..fd5b0fe6d 100644 --- a/tur-continuous/chromium/build.sh +++ b/tur-continuous/chromium/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.chromium.org/Home TERMUX_PKG_DESCRIPTION="Chromium web browser" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Chongyun Lee " -_CHROMIUM_VERSION=112.0.5615.49 +_CHROMIUM_VERSION=113.0.5672.63 TERMUX_PKG_VERSION=$_CHROMIUM_VERSION TERMUX_PKG_SRCURL=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_CHROMIUM_VERSION.tar.xz) -TERMUX_PKG_SHA256=(ddfd37373c1fa0f433a6ac11f0baa2b1f3fdfb9c7b5867e32a4300f2eb5aff41) +TERMUX_PKG_SHA256=(76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e) TERMUX_PKG_DEPENDS="atk, cups, dbus, gtk3, krb5, libc++, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, libdrm, libjpeg-turbo, libpng, libwebp, libflac, fontconfig, freetype, zlib, libxml2, libxslt, libopus, libsnappy" # TODO: Split chromium-common and chromium-headless # TERMUX_PKG_DEPENDS+=", chromium-common" @@ -15,8 +15,9 @@ TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase, qt5-qtbase-cross-tools" # Chromium doesn't support i686 on Linux. TERMUX_PKG_BLACKLISTED_ARCHES="i686" -SYSTEM_LIBRARIES=" libdrm libjpeg libpng libwebp flac fontconfig freetype zlib libxml libxslt opus snappy " -# TERMUX_PKG_DEPENDS="libdrm, libjpeg-turbo, libpng, libwebp, libflac, fontconfig, freetype, zlib, libxml2, libxslt, libopus, libsnappy" +# TEMP disable zlib +SYSTEM_LIBRARIES=" libdrm libjpeg libpng libwebp flac fontconfig freetype libxml libxslt opus snappy " +# TERMUX_PKG_DEPENDS="libdrm, libjpeg-turbo, libpng, libwebp, libflac, fontconfig, freetype, libxml2, libxslt, libopus, libsnappy" termux_step_post_get_source() { python $TERMUX_SCRIPTDIR/common-files/apply-chromium-patches.py -v $_CHROMIUM_VERSION @@ -189,6 +190,7 @@ ozone_platform_wayland = true ozone_platform_headless = true angle_enable_vulkan = true angle_enable_swiftshader = true +angle_enable_abseil = false # Use Chrome-branded ffmpeg for more codecs is_component_ffmpeg = true ffmpeg_branding = \"Chrome\" @@ -206,6 +208,9 @@ enable_nacl = false is_cfi = false use_cfi_icall = false use_thin_lto = false +# XXX: Do not generate v8_context_snapshot.bin for a faster build +# TODO: Find out what causes failure on arm +use_v8_context_snapshot = false " > $_common_args_file if [ "$TERMUX_ARCH" = "arm" ]; then @@ -213,11 +218,6 @@ use_thin_lto = false echo "arm_float_abi = \"softfp\"" >> $_common_args_file fi - # TODO: Generate v8_context_snapshot.bin for arm - if [ "$TERMUX_ARCH" = "arm" ]; then - echo "use_v8_context_snapshot = false" >> $_common_args_file - fi - # Use custom toolchain mkdir -p $TERMUX_PKG_CACHEDIR/custom-toolchain cp -f $TERMUX_PKG_BUILDER_DIR/toolchain.gn.in $TERMUX_PKG_CACHEDIR/custom-toolchain/BUILD.gn @@ -304,10 +304,6 @@ termux_step_make_install() { libqt5_shim.so ) - if [ "$TERMUX_ARCH" != "arm" ]; then - normal_files+=(v8_context_snapshot.bin) - fi - cp "${normal_files[@]/#/out/Release/}" "$TERMUX_PREFIX/lib/chromium/" cp -Rf out/Release/angledata $TERMUX_PREFIX/lib/chromium/