From nobody Thu Oct 12 07:43:01 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 4S5hSj6QHhz4xPvb; Thu, 12 Oct 2023 07:43:01 +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 4S5hSj5ksgz3K83; Thu, 12 Oct 2023 07:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697096581; 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=0e9AVCvR1VGPanVVx38tB3LcQwVVYcnr043BIPMIdLY=; b=IMY2E+EfOLS2Hqo6ILZhjR8JZk4T6xmJ94v8eldfy9WCVQFHH9dGGeUEV4HHOvwTcNvTEF LnHxafxtWqit49Ut4ROdOsYC3rmhn4P5qyrCbkImwlngYR25/o5A9nQ3OuxInDAT8+JMjX J0dR8qb0PK+dPpZjGq/CNpLHHCcgehUkiLWh4fCJymPK3p4LmN6igtBKeq6h0LFfC+Jvb0 MAsyi+V/HOoTTMC8VGpeLXzDNHNSEckN2KVe8qTXM6/vxL19eIxoDGxwGPiOq0hSUGQPqb YL4nNXxag5DZqP831FsnRDhCfB9xMUWlCaYLV8cG02WyHvv1l952msk3XJ3wgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697096581; a=rsa-sha256; cv=none; b=ErtcLq7PYnxn9m13dA3oRVyezoh7KviyVDW0MIzLTBCPMNJ5F+0O+lJkhLyPFRoUhKBjLK 9oafVUbhT0ggt5bq5WCkhSwOmyqnd2yGe5AWyQF6II/TZRK3AL4CWi+00aoIHAp75HYsQD nsvB6gGeBqRvFLa546aIFI3CBMrsEe1Uk0UHqI46V5FzsVGGEJt7tIUKCkFIfq/c+DqP1J eaw1+pv6bEQIcD+69rE1PrVCiteNaViURwIb1QOuKGtj/7vlGqh5EmXCBqR2LGmt8/WCjf FCipT4ItHKs0mdCPid69uYimQzxAniAD9c1yAiuAbgIUh+7mFhQRor6Xp1QgFA== 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=1697096581; 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=0e9AVCvR1VGPanVVx38tB3LcQwVVYcnr043BIPMIdLY=; b=kvXXuVNZW+2FDYUFb27j2mJHNLZMciRQSy5delMUhZ5/VNY5ZCiNAsmYGzw75gzRJRHyNh kI9hggUVvg8mWWpcNGfKuPETMppv2SnMt6SpIw9zvbfOv4s/02B4zlPBdA/AgodimcKbgv IjZJOpdzVCtydcv0x0UooJhDHmnwQhYn3iJPPScAa4onhfaBL2MmB7MKE9yT7tE5XoHYJ2 RHZbFQp2rsfpIQzuhRfJK3D24vqIVBjEvTA2DbOFO9LjdkQKx0oJYIXH/tSEZ1ZIVIy88h 907wgSXsE+en7bmwsLWB+FNiuWymM5wIzUnGhGh8iR+8w+JjxyyFjNaB9fbgGA== 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 4S5hSj4g3Pzvqf; Thu, 12 Oct 2023 07:43:01 +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 39C7h1G9024083; Thu, 12 Oct 2023 07:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39C7h1p4024080; Thu, 12 Oct 2023 07:43:01 GMT (envelope-from git) Date: Thu, 12 Oct 2023 07:43:01 GMT Message-Id: <202310120743.39C7h1p4024080@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: e95003828d63 - 2023Q4 - 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: e95003828d63808b3859ff20290ef2f6d01d393f Auto-Submitted: auto-generated The branch 2023Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e95003828d63808b3859ff20290ef2f6d01d393f commit e95003828d63808b3859ff20290ef2f6d01d393f Author: Gleb Popov AuthorDate: 2023-10-08 14:05:50 +0000 Commit: Gleb Popov CommitDate: 2023-10-12 07:41:13 +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. (cherry picked from commit cd7728bb00455b4d12afd6a9dae69b084eeea137) --- www/chromium/Makefile | 1 + www/chromium/files/chrome.in | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b9ab9ccc2f5f..db514151e7ec 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= chromium PORTVERSION= 117.0.5938.149 +PORTREVISION= 1 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+"$@"}