From nobody Sun Oct 08 14:39:42 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S3PvM3mx5z4wtd3; Sun, 8 Oct 2023 14:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S3PvM06NLz4gBp; Sun, 8 Oct 2023 14:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696775983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=okznAZRtn0JgUEAWok5jbNKVQMzBQiqv5UnOHT3d1Nc=; b=YPrPj54Mq8J6sgCTPO/GZuhjZ2o470whFMIQw4pWjD35zPshSxbKuntCJc9K8LyyIBs2nk qJ/5HfFtXzMuKah+JiuP4bWEjbZpQR1iFaWF+47ttvQdDH+SqtdWHOhgkqiYPuuDAv9ZSO b3n/GAiqWz5LpAbkIqhWmjLyD9yRVLEPLA7gB2quZYJv64X2tZcpz6WNiTkf33iaMttAoz mxhfDfUON5wyQRm2/X6oFxQv54+ZSVlxUvQPAmPPDQ9n7XeU1YO9QSClRIniTyYbpZUC3A 84hTYa5Ukbal7g7tBy2OgzmNZmB9r/NfUo2uv+WfBnLSebcRGXqFmaT+k9U7zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696775983; a=rsa-sha256; cv=none; b=rKF/MSss4WKm2AoopYEJLVf8xqpe37MDoJxwiTODJ9RiHerEgg8tTP6AyFH9+sBmv9lxh6 rQidFMmb1nOYLMaDLtV9BAslV90LiQcMTIpq08Ed1rzKWkP0iyKJJVrfoiApqpbqp/o+mx 7Ohebv33Mulo/dZ4avCqXMmUUkIZ6Ol0xbaGXzTNtEED70YV7FbDke0PY6Zgcc0EUqLsBs SnE1R/ddE+KFIFJELwSDr6wmyNQtEJZ4nENS8I7tZXteTgP9TaasOfFEnoXwIDjruU9tWI BvgEzZfwb+qOq8g34wZl70Lk+4oVCGgClwzHwWqb/ImZMZimKwu+meJtSLHIpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696775983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=okznAZRtn0JgUEAWok5jbNKVQMzBQiqv5UnOHT3d1Nc=; b=oCSmsjo/rj/1sljxTCVVWtAiQzyZpRGv67cWtxvB2ycrYzcXMITu6vKMupG2zq/58T92SS 1jfLTdpkua5E8VkKRC/Tvt3T52Rw+LGuYnLIJ1jmCYTmNhJpfnf3ItvH8iUOD75YEOWPP9 PsUT3Z0UhBT3Yp4RQetIu9NZXbEOci6EksRuh5cyOSa7UrVeErnzjSM7HzClHtHsQzwT1r w7JpvykKe1k68+ReaY4AlZ6nfM97aHr0RwsGpY6/Y/TVcu61bNe0arapNaOydMZ0CuTBEi NEJVxRlw61xV4j6hgIyxSSadWucvh3XFrrXKTnTxH1qrSf2JHxQdYsJqd/H9Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S3PvL6KWlz27P; Sun, 8 Oct 2023 14:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 398Edg4l006860; Sun, 8 Oct 2023 14:39:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 398Edg0G006857; Sun, 8 Oct 2023 14:39:42 GMT (envelope-from git) Date: Sun, 8 Oct 2023 14:39:42 GMT Message-Id: <202310081439.398Edg0G006857@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: cd7728bb0045 - main - www/chromium: Catch up with foreign-cdm changes. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd7728bb00455b4d12afd6a9dae69b084eeea137 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd7728bb00455b4d12afd6a9dae69b084eeea137 commit cd7728bb00455b4d12afd6a9dae69b084eeea137 Author: Gleb Popov AuthorDate: 2023-10-08 14:05:50 +0000 Commit: Gleb Popov 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+"$@"}