Date: Thu, 15 Apr 2021 10:55:13 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 3869e43147b8 - 2021Q2 - www/chromium: pet portclippy Message-ID: <202104151055.13FAtDtb060484@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=3869e43147b885d1fc1d926a696bd55f7093276a commit 3869e43147b885d1fc1d926a696bd55f7093276a Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2021-04-12 15:31:54 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2021-04-15 10:53:08 +0000 www/chromium: pet portclippy (cherry picked from commit d8400d2cc3eb157b040171a5ac1e07aebcb626e9) --- www/chromium/Makefile | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 67d02ab4f1b9..b0ddb5680f61 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -68,22 +68,22 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg -MAKE_ARGS= -C out/${BUILDTYPE} -BINARY_ALIAS= python=${PYTHON_CMD} -DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h - CPE_VENDOR= google CPE_PRODUCT= chrome +DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h USE_GL= gbm gl +USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt +INSTALLS_ICONS= yes USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst -USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format + +MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome -INSTALLS_ICONS= yes +BINARY_ALIAS= python=${PYTHON_CMD} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) @@ -127,21 +127,17 @@ SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST -CODECS_DESC= Compile and enable patented codecs like H.264 -DRIVER_DESC= Install chromedriver +OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO - OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT -HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) +OPTIONS_SUB= yes +CODECS_DESC= Compile and enable patented codecs like H.264 +DRIVER_DESC= Install chromedriver HEIMDAL_BASE_DESC= Heimdal Kerberos (base) +HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) MIT_DESC= MIT Kerberos (security/krb5) -HEIMDAL_LIB_DEPENDS= libkrb.so.26:security/heimdal -MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 - -OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO -OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ @@ -173,6 +169,7 @@ DEBUG_VARS_OFF= BUILDTYPE=Release \ DRIVER_MAKE_ARGS= chromedriver +HEIMDAL_LIB_DEPENDS= libkrb.so.26:security/heimdal KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false @@ -180,6 +177,7 @@ LTO_VARS= GN_ARGS+=use_thin_lto=true \ GN_ARGS+=thin_lto_enable_optimizations=true \ WANTSPACE="14 GB" +MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false @@ -193,9 +191,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" -TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts-85${EXTRACT_SUFX}:fonts +TEST_ALL_TARGET= ${TEST_TARGETS} .include <bsd.port.options.mk> .include <bsd.port.pre.mk> @@ -288,12 +286,6 @@ do-configure: ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd -do-test-TEST-on: -.for t in ${TEST_TARGETS} - cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ - ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} -.endfor - do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ @@ -353,4 +345,10 @@ post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin +do-test-TEST-on: +.for t in ${TEST_TARGETS} + cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ + ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} +.endfor + .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104151055.13FAtDtb060484>