1 files changed, 97 insertions, 245 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 2e853ab9f7bd..91669b90e60d 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	52.0.2743.116
-PORTREVISION=	4
+PORTVERSION=	54.0.2840.100
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -14,9 +13,7 @@ COMMENT=	Google web browser based on WebKit
 LICENSE=	BSD3CLAUSE LGPL21 MPL
 LICENSE_COMB=	multi
 
-BROKEN_FreeBSD_9=does not patch
-
-CFLAGS+=	-isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0
+BROKEN_FreeBSD_9=does not configure
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
 		bash:shells/bash \
@@ -28,8 +25,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
 
-LIB_DEPENDS=	libasound.so:audio/alsa-lib \
-		libcairo.so:graphics/cairo \
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libcups.so:print/cups \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
@@ -39,7 +35,6 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfreetype.so:print/freetype2 \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libharfbuzz.so:print/harfbuzz \
-		libevent.so:devel/libevent2 \
 		libexif.so:graphics/libexif \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgcrypt.so:security/libgcrypt \
@@ -56,101 +51,60 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libwebp.so:graphics/webp \
 		libxml2.so:textproc/libxml2
 
-RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
-		alsa-lib>=1.1.1_1:audio/alsa-lib \
-		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
+RUN_DEPENDS=	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
 		xdg-open:devel/xdg-utils
 
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		bison cpe desktop-file-utils execinfo jpeg \
+USES=		compiler bison cpe desktop-file-utils execinfo jpeg \
 		ninja perl5 pkgconfig python:2,build shebangfix tar:xz
-# chromium requires a recent compiler (C++11 capable, but clang 3.4 is
-# not able to build chromium. OTOH clang36 on FreeBSD 9.3 cannot build
-# chromium as the libc++ includes are not up to the task. USES flags
-# have to be set before bsd.ports.pre.mk and thereby cannot depend on
-# bsd.ports.pre.mk's variables, so I'm using a hack here.
-.if exists(/usr/lib/libc++.a)
-USES+=	compiler:c++14-lang
-.else
-USES+=	compiler:c++11-lib
-.endif
 
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_PERL5=	build
 USE_XORG=	scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \
 		xproto xrandr xrender xscrnsaver xtst
-USE_GNOME=	atk glib20 gtk20 dconf libxslt
+USE_GNOME=	atk glib20 gtk20 dconf libxslt libxml2
 MAKE_ARGS=	-C out/${BUILDTYPE}
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
 ALL_TARGET=	chrome
 INSTALLS_ICONS=	yes
 
-#TODO bz@ : install libwidevinecdm.so (see
-#   third_party/widevine/cdm/widevine_cdm.gyp)
-# See build/common.gypi for all the available variables.
-GYP_DEFINES+=	\
-		clang_use_chrome_plugins=0 \
-		linux_breakpad=0 \
-		linux_use_heapchecker=0 \
-		linux_strip_binary=1 \
-		use_aura=1 \
-		test_isolation_mode=noop \
-		disable_nacl=1 \
-		enable_extensions=1 \
-		enable_one_click_signin=1 \
-		enable_openmax=1 \
-		enable_webrtc=1 \
-		werror= \
-		no_gc_sections=1 \
-		OS=freebsd \
-		os_ver=${OSVERSION} \
-		prefix_dir=${LOCALBASE} \
-		python_ver=${PYTHON_VER} \
-		use_allocator=none \
-		use_cups=1 \
-		linux_link_gsettings=1 \
-		linux_link_libpci=1 \
-		linux_link_libspeechd=1 \
-		libspeechd_h_prefix=speech-dispatcher/ \
-		usb_ids_path=${LOCALBASE}/share/usbids/usb.ids \
-		want_separate_host_toolset=0 \
-		use_system_bzip2=1 \
-		use_system_flac=1 \
-		use_system_harfbuzz=1 \
-		use_system_icu=1 \
-		use_system_jsoncpp=1 \
-		use_system_libevent=1 \
-		use_system_libexif=1 \
-		use_system_libjpeg=1 \
-		use_system_libpng=1 \
-		use_system_libusb=1 \
-		use_system_libwebp=1 \
-		use_system_libxml=1 \
-		use_system_libxslt=1 \
-		use_system_nspr=1 \
-		use_system_protobuf=0 \
-		use_system_re2=1 \
-		use_system_snappy=1 \
-		use_system_speex=1 \
-		use_system_xdg_utils=1 \
-		use_system_yasm=1 \
-		v8_use_external_startup_data=0
-# allow removal of third_party/adobe
-GYP_DEFINES+=	flapper_version_h_file='${WRKSRC}/flapper_version.h'
+# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
+#
+# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all the variables.
+# Some parts don't have use_system_* flag, and can be turned on/off by using
+# replace_gn_files.py script, some parts just turned on/off for target host
+# OS "target_os == is_bsd", like libusb, libpci.
+GN_ARGS+=	\
+		clang_use_chrome_plugins=false \
+		enable_hevc_demuxing=true \
+		enable_media_router=true \
+		enable_nacl=false \
+		enable_remoting=false \
+		toolkit_views=true \
+		use_allocator="none" \
+		use_aura=true \
+		use_experimental_allocator_shim=true \
+		treat_warnings_as_errors=false \
+		use_sysroot=false \
+		use_system_libjpeg=true \
+		use_system_sqlite=false   # chrome has additional patches
+# TODO: investigate building with these options:
+# use_system_icu use_system_harfbuzz use_system_minigbm
+GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild
 
 # FreeBSD Chromium Api Key
 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 # Note: these are for FreeBSD use ONLY. For your own distribution,
 # please get your own set of keys.
-GYP_DEFINES+=	google_api_key=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 \
-		google_default_client_id=996322985003.apps.googleusercontent.com \
-		google_default_client_secret=IR1za9-1VK0zZ0f_O8MVFicn
+GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
+		google_default_client_id="996322985003.apps.googleusercontent.com" \
+		google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
 
 SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
-OPTIONS_DEFINE=	CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER
+OPTIONS_DEFINE=	ALSA CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER
 CODECS_DESC=	Compile and enable patented codecs like H.264
 DRIVER_DESC=	Install chromedriver
 
@@ -158,44 +112,39 @@ OPTIONS_DEFAULT=	CODECS GCONF KERBEROS
 OPTIONS_SUB=	yes
 
 GCONF_USE=	GNOME=gconf2
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
+			alsa-lib>=1.1.1_1:audio/alsa-lib
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 DRIVER_MAKE_ARGS=chromedriver
 TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MALSA}
+GN_ARGS+=	use_alsa=true
+.else
+GN_ARGS+=	use_alsa=false
+.endif
+
 .if ${PORT_OPTIONS:MCODECS}
-GYP_DEFINES+=	ffmpeg_branding=Chrome
-GYP_DEFINES+=	proprietary_codecs=1
+GN_ARGS+=	ffmpeg_branding="Chrome"
+GN_ARGS+=	proprietary_codecs=true
 .else
-GYP_DEFINES+=	ffmpeg_branding=Chromium
-GYP_DEFINES+=	proprietary_codecs=0
+GN_ARGS+=	ffmpeg_branding="Chromium"
+GN_ARGS+=	proprietary_codecs=false
 .endif
 
 .if ${PORT_OPTIONS:MGCONF}
-GYP_DEFINES+=	use_gconf=1
+GN_ARGS+=	use_gconf=true
 .else
-GYP_DEFINES+=	use_gconf=0
+GN_ARGS+=	use_gconf=false
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-GYP_DEFINES+=	use_pulseaudio=1
+GN_ARGS+=	use_pulseaudio=true
 .else
-GYP_DEFINES+=	use_pulseaudio=0
-.endif
-
-.if empty(MACHINE_CPU:Msse2)
-GYP_DEFINES+=	disable_sse2=1
-.endif
-
-.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libusb-pc
-.endif
-
-# pointed out by "Tomek" on freebsd-chromium@
-.if !exists(/usr/lib/libexecinfo.so)
-CFLAGS+=	-fno-omit-frame-pointer
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fixup-ffmpeg
+GN_ARGS+=	use_pulseaudio=false
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
@@ -206,180 +155,80 @@ ALL_TARGET+=	${TEST_TARGETS}
 DEBUG_MAKE_ENV=	V=1
 .if ${PORT_OPTIONS:MDEBUG}
 BUILDTYPE=	Debug
+GN_ARGS+=	is_debug=true
+GN_BOOTSTRAP_FLAGS+=	--debug
+#GN_ARGS+=	is_component_build = true
 .else
 BUILDTYPE=	Release
+.if ${ARCH} == amd64
+GN_ARGS+=	use_lld=true # harder, better, faster, stronger
+.endif
+GN_ARGS+=	is_debug=false
+GN_ARGS+=	symbol_level=0
+GN_ARGS+=	remove_webcore_debug_symbols=true
 .endif
 
-CONFIGURE_ENV+=	CC="${CC}" \
-		CXX="${CXX}" \
-		GYP_GENERATORS=ninja \
-		GYP_DEFINES="${GYP_DEFINES}"
 MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
 		GPERF="${LOCALBASE}/bin/gperf"
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
-GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
+GN_ARGS+=	gcc_version=${CXX:S/g++//}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gcc
-CFLAGS+=	-fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local
 .else
-GYP_DEFINES+=	clang=1
-CFLAGS+=	-Wno-unknown-warning-option \
-			-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1 # work around base r261801
+BUILD_DEPENDS+=	clang39:devel/llvm39
+CC=		clang39
+CXX=		clang++39
+# /usr/local/include unlike gcc isn't clang's default
+MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
+		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
+GN_ARGS+=	is_clang=true
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
-CONFIGURE_ENV+=	AR=/usr/bin/ar
 .endif
 
-.if ! ${PORT_OPTIONS:MKERBEROS}
-GYP_DEFINES+=	use_kerberos=0
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000
+BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
+CXXFLAGS+=	-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1
 .endif
 
-# according to portlint the below is passed via bsd.port.mk,
-# but 'make -V CONFIGURE_ENV' does not show it:
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+.if ${OSVERSION} < 1100000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-10
+.endif
+
+.if ! ${PORT_OPTIONS:MKERBEROS}
+GN_ARGS+=	use_kerberos=true
+.endif
 
 pre-everything::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory"
+	@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory,"
 .if ${PORT_OPTIONS:MDEBUG}
-	@${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)."
+	@${ECHO_MSG} "lots of free diskspace (~ 40GB)"
+	@${ECHO_MSG} "and no less then 16GB of memory for linking."
 .else
 	@${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)."
 .endif
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Make sure you have Python build with the SEM option ON"
 	@${ECHO_MSG} "(default in python27-2.7.8 since r361735)"
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
-		${WRKSRC}/crypto/crypto.gyp \
-		${WRKSRC}/v8/src/v8.gyp \
-		${WRKSRC}/v8/gypfiles/toolchain.gypi
-	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
-		${WRKSRC}/chrome/common/chrome_paths.cc \
-		${WRKSRC}/base/base.gyp
+	@${ECHO_MSG}
 
 pre-configure:
-	# phajdan-jr: list of things *not* to remove, so maybe the script
-	#             should be called "keep_bundled_libraries.py"
+	# We used to remove bundled libraries to be sure that chromium uses
+	# system libraries and not shippen ones.
+	# cd ${WRKSRC} && ${PYTHON_CMD} \
+	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${PYTHON_CMD} \
-		./build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mock4js' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party' \
-		'third_party/blanketjs' \
-		'third_party/brotli' \
-		'third_party/boringssl' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/third_party/beautifulsoup4' \
-		'third_party/catapult/third_party/py_vulcanize' \
-		'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
-		'third_party/catapult/tracing' \
-		'third_party/catapult/tracing/third_party' \
-		'third_party/cld' \
-		'third_party/cros_system_api' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/gardiner_mod' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/icu/icu.isolate' \
-		'third_party/jinja2' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsrtp' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libwebm' \
-		'third_party/libxml/chromium' \
-		'third_party/libXNVCtrl' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/markupsafe' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mt19937ar' \
-		'third_party/openh264' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party' \
-		'third_party/ply' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/protobuf/third_party' \
-		'third_party/protobuf/third_party/six' \
-		'third_party/pywebsocket' \
-		'third_party/qcms' \
-		'third_party/qunit' \
-		'third_party/sfntly' \
-		'third_party/sinonjs' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/tlslite' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/woff2' \
-		'third_party/x86inc' \
-		'third_party/yasm' \
-		'third_party/zlib' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/valgrind' \
-		'v8/src/third_party/fdlibm' \
-		--do-remove || ${FALSE}
-	cd ${WRKSRC} && ${PYTHON_CMD} \
-		./build/linux/unbundle/replace_gyp_files.py \
-		${GYP_DEFINES:C/^/-D/} || ${FALSE}
-	# allow removal of third_party/adobe
-	${ECHO_CMD} > ${WRKSRC}/flapper_version.h
-	# missing file: file is in -testdata only, but configure stage
-	# will fail if it's not there. do not break TESTS build while
-	# allowing regular build without pulling in -testdata.
-	${TOUCH} ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html
+		./build/linux/unbundle/replace_gn_files.py --system-libraries \
+		flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}
 
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
-		./build/gyp_chromium chrome/chrome.gyp --depth .
+	# GN generator bootstrapping and generating ninja files
+	cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} ${PYTHON_CMD} \
+		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
+	cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \
+		gen --args='${GN_ARGS}' out/${BUILDTYPE}
 
 test regression-test: build
 .for t in ${TEST_TARGETS}
@@ -397,14 +246,17 @@ do-install:
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
 		${STAGEDIR}${DATADIR}
-.for p in chrome_100_percent content_resources keyboard_resources resources
+.for p in chrome_100_percent chrome_200_percent keyboard_resources resources
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \
 		${STAGEDIR}${DATADIR}
 .endfor
+.for d in icudtl.dat natives_blob.bin
+	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
+.endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
 		${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
-		${COPYTREE_SHARE} "locales pseudo_locales resources" ${STAGEDIR}${DATADIR}
+		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \
 		${STAGEDIR}${DESKTOPDIR}