From nobody Wed Mar 05 15:15:05 2025 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 4Z7GLy01pYz5qKbb; Wed, 05 Mar 2025 15:15:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7GLx4k0Xz3Gyf; Wed, 05 Mar 2025 15:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741187705; 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=vhft1O902EBloDnkEa/TlfNfNL4TUR4iQ2pEqrN4nQo=; b=Od6gwYEkr3fqoHh0uLWifBH+5GVXmeprP1v5OOjbsc1IqogVRnoOQnDQ3SqmZvrszZGD7H A9INpEhd2dRJieakhZvta+UNGO3IdhboHMgpQdcqjE2ykmR4MDibqcFIk78JDfGGT5EerW Nh8N5SzG2kgtJK1NEyBl6oxq0B71HR+HQjwxVEA9bsRXR9B9hw3W4frNJ6y3MTt6XPGFkq 2938wH2v8r5Vhpiqi7S2zwWMIw32xs3C1UuOf72bHtIw2wAd4Fvo3rZu0z0gidsRj57kqm D+fbbWlTdqQwSNvnkUXOjlRkJqoefUcDIbgb3mNK9HBURsbesCwBDvGQbPCxDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741187705; a=rsa-sha256; cv=none; b=n9S/ny48fPqlDOQ6luWjv7TdUo4qGjd3U8cFSbRbID+fKwNcKMJx+b80m34S3mRCgQzTy6 H00OgIqFVLtYKBDgG8ASouiOJBFXPDufO2DuFLhSD+PJJsOKXgrW9VZjeg+RRwjfUiY1JL AelBe6VEnQ+mD9Yr/w0qcJQ0xsryaZOLxwu/oRNW+QRtOachMM8LvrQlreqmLbrv/11x8A fhHRyH3cfrSrlp8QEio8ygk9Om47WMtTTI8pQWLpqxtcrp6DJSs8RbWEzdEA7Yr71CKoVg RXadSB9NJ8towN+W2jkNUUuGdY4a84GmLWSADRQHoSIbWwB3nOz6YaGghSGUzg== 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=1741187705; 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=vhft1O902EBloDnkEa/TlfNfNL4TUR4iQ2pEqrN4nQo=; b=iS7xRX3M6Mqe+t+3wz66YrpzGKxXJ0HyGQKdTSyndyCyt9injknVOZxrY6+a17n8zSjE0O FQa3JIqLIYRLRKws4VgCcQJIkkm8wFJzHq/TncKUPZI9BIWA7P6jOddtOn2gy3MkeyxHIW a2z/reStES71iGzXf2gI2Mxzt83N1aDCHe9C6pDmEuIeDGBsSBRntplbtQD7Lo4DWXcNCv QBOhGz3Wx2bPDkM4avro0iIRZQBOKSLFecVzSx2cugijpeZQ16QkRvKfVK1oejX6pBohrq m6Ab9t6+rPvI2h4fodP5aN3aS0+H6sU/nV27RLByw1VNavlNXkz6gHdlM32xdA== 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 4Z7GLx4FqKz18ZV; Wed, 05 Mar 2025 15:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 525FF5SU091129; Wed, 5 Mar 2025 15:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 525FF5PB091126; Wed, 5 Mar 2025 15:15:05 GMT (envelope-from git) Date: Wed, 5 Mar 2025 15:15:05 GMT Message-Id: <202503051515.525FF5PB091126@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: 9ddbf1f6fcac - main - www/foreign-cdm: Support both rl9 and c7 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 9ddbf1f6fcac4aa161cb7b85f49128e160a46468 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ddbf1f6fcac4aa161cb7b85f49128e160a46468 commit 9ddbf1f6fcac4aa161cb7b85f49128e160a46468 Author: Thibault Payet AuthorDate: 2025-03-05 15:13:50 +0000 Commit: Gleb Popov CommitDate: 2025-03-05 15:14:57 +0000 www/foreign-cdm: Support both rl9 and c7 PR: 285163 Co-authored-by: Gleb Popov --- www/foreign-cdm/Makefile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/www/foreign-cdm/Makefile b/www/foreign-cdm/Makefile index 86f7c3b785ed..31509b524b10 100644 --- a/www/foreign-cdm/Makefile +++ b/www/foreign-cdm/Makefile @@ -13,17 +13,19 @@ LICENSE= MIT ONLY_FOR_ARCHS= amd64 -BUILD_DEPENDS= cmake:devel/cmake-core \ - linux-c7-devtoolset>0:devel/linux-c7-devtoolset -RUN_DEPENDS= linux_base-c7>0:emulators/linux_base-c7 +BUILD_DEPENDS= cmake:devel/cmake-core + +USES= linux USE_GITHUB= yes +USE_LDCONFIG= yes +USE_LINUX= base:build,run devtools:build + GH_ACCOUNT= shkhln GH_PROJECT= foreign-cdm GH_TUPLE= capnproto:capnproto:928c8390d4d562bd32dc79a42eb64e9bdba572d8:capnproto/third_party/capnproto -MAKE_ENV= LINUX_CC=/compat/linux/opt/rh/devtoolset-11/root/usr/bin/g++ \ - MAKE_JOBS_NUMBER=${MAKE_JOBS_NUMBER} +MAKE_ENV= MAKE_JOBS_NUMBER=${MAKE_JOBS_NUMBER} SUB_FILES= fcdm-setup-env @@ -36,6 +38,15 @@ PLIST_FILES= libexec/fcdm-jail \ CDM_INT_HASH= 06395a2863cb1ebdb47617a995b73f95c14fe120 +.include + +.if ${LINUX_DEFAULT} == c7 +BUILD_DEPENDS+= linux-c7-devtoolset>0:devel/linux-c7-devtoolset +MAKE_ENV+= LINUX_CC=/compat/linux/opt/rh/devtoolset-11/root/usr/bin/g++ +.else +MAKE_ENV+= LINUX_CC=/compat/linux/usr/bin/x86_64-redhat-linux-g++ +.endif + post-extract: ${MV} ${WRKDIR}/*.h ${WRKSRC}/third_party/cdm/ @@ -58,4 +69,4 @@ do-install: ${LN} -s ${PREFIX}/lib/foreign-cdm/fcdm-fbsd.so ${STAGEDIR}${PREFIX}/share/chromium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so ${LN} -s ${PREFIX}/lib/WidevineCdm/manifest.json ${STAGEDIR}${PREFIX}/share/chromium/WidevineCdm/manifest.json -.include +.include