Date: Sun, 8 Oct 2023 14:39:42 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cd7728bb0045 - main - www/chromium: Catch up with foreign-cdm changes. Message-ID: <202310081439.398Edg0G006857@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd7728bb00455b4d12afd6a9dae69b084eeea137 commit cd7728bb00455b4d12afd6a9dae69b084eeea137 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-10-08 14:05:50 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-10-08 14:39:36 +0000 www/chromium: Catch up with foreign-cdm changes. This should reduce amount of PORTREVISION bumps on the Chromium port when updating www/foreign-cdm. --- www/chromium/Makefile | 2 +- www/chromium/files/chrome.in | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index db514151e7ec..3189946b487e 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,6 +1,6 @@ PORTNAME= chromium PORTVERSION= 117.0.5938.149 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/chromium/files/chrome.in b/www/chromium/files/chrome.in index 9bd861920963..09cf25a8c171 100644 --- a/www/chromium/files/chrome.in +++ b/www/chromium/files/chrome.in @@ -17,8 +17,9 @@ EOMSG fi ulimit -c 0 -# variables for foreign-cdm -export FCDM_CDM_SO_PATH=/compat/linux/usr/lib/foreign-cdm/libwidevinecdm.so -export FCDM_WORKER_PATH=/compat/linux/usr/bin/fcdm-worker +# source foreign-cdm environment +if [ -r %%PREFIX%%/share/foreign-cdm/fcdm-setup-env ] ; then + . %%PREFIX%%/share/foreign-cdm/fcdm-setup-env +fi exec %%PREFIX%%/share/chromium/chrome ${1+"$@"}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310081439.398Edg0G006857>