From nobody Thu Oct 12 07:42:55 2023 X-Original-To: dev-commits-ports-branches@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 4S5hSc1VXTz4xQBj; Thu, 12 Oct 2023 07:42:56 +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 4S5hSc0m2Tz3JkC; Thu, 12 Oct 2023 07:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697096576; 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=XgXWKom09A6r1RuWL+U9a6wR+5TLT9AogT6oe3rNFfc=; b=WZ9N/j6q6MWLRDSjvwa03ndKW2+Nei+sHry3Q7hXfi59wNdKXghTW6n6JqfRkX7ZhtEdnI wiOD+c+ZwGRIL0BtjM5fWUcCAmyDKBJG0MHexUNSzI94M2oMeDn23RZ99HCNF7zrm0aufl RUDoBVFgjjsW89RRX6QAk2PiC15eE72rBMcrodM9giNB2kOwld24qcaMkXgNcKvF5horiT 5rKWFp0s00QlpGWSYyg7IypBISnyVcNYrg4e5T6dhvZbnknccjPgrz/Yq9h9n2CiVMpAsQ x6NTZceulcpthiKn7H4KQBYoMuRNTP6nULx6WG7QHQJhY5Dkna0m2ICq80ZxlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697096576; a=rsa-sha256; cv=none; b=PCPStHw6a4BBRYL567AAk2zGq1rdJZ8TradZrm1nXf7HW4ZaLVbivzGUkOhyp+bk8vGlMQ C3daM0SlA7Kumx945fzDJCrY0NZz4a58aOWYj5SZYEyBaMMaTnGCp9q3RS/51gbvsdbCIg 2gD9J65xGkPzfLR1EUwISM1nVhAONF9Oe9DZit0+Ryz1k6NQ+H6D1wydofST111Cldnmbw j7jMDa0KmPXsKPNdxm/R7dKNkRXo8LEUNnjqCBZiK4sCYlVNjuY2jgqefWqJhv2i8CZYDi /WXaxzqppBr93VPsRQgAPonZysBvSbZ47+8daltQqeEmYcSJG0yV7hULRf9RlQ== 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=1697096576; 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=XgXWKom09A6r1RuWL+U9a6wR+5TLT9AogT6oe3rNFfc=; b=ToDkTH3ryAY/Y9xNZDtigTehpMRio2smWwvWYiAIsHGp2bVgf22sRQPrJiHQpe7dzp+Vaj BySxepf/wYcbTG+UjpqTevV/iGsPXu+IZqjpo1hL4P3JkstLr6es9laaubudGfcmVUeKli GHH9F53i0KUrLdSYVLcdkjaD0VuyE2v5IraU2UOhn5PjdQwnb1DsDbi6hefaBcGdJWdJ4a AtE1OMWjRMfdNOFV+P1m7mvBCWXyYxWXU2HS0AgFkmazBEB1NJ293eVgsYxr8aAO8dXfNv otq+vWD9FvTx6b1v0CDm8VT954Mo9Qf3kC/F6lKF7XV+bDKDYCc+QHfjcg914A== 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 4S5hSb6js4zw2W; Thu, 12 Oct 2023 07:42:55 +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 39C7gtQD023837; Thu, 12 Oct 2023 07:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39C7gtY4023834; Thu, 12 Oct 2023 07:42:55 GMT (envelope-from git) Date: Thu, 12 Oct 2023 07:42:55 GMT Message-Id: <202310120742.39C7gtY4023834@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: 196319371146 - 2023Q4 - www/foreign-cdm: Reorganize the port. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 196319371146dace1d459788f3887b0b690327e8 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=196319371146dace1d459788f3887b0b690327e8 commit 196319371146dace1d459788f3887b0b690327e8 Author: Gleb Popov AuthorDate: 2023-10-08 14:01:34 +0000 Commit: Gleb Popov CommitDate: 2023-10-12 07:38:53 +0000 www/foreign-cdm: Reorganize the port. - Do not install anything into LINUXBASE. - Add an environment setup script. - Remove pkg-plist. - Remove original Google Widevine files from this port to avoid licensing problems. Users are expected to install www/linux-widevine-cmd on their own. (cherry picked from commit 50f7afc62558db975f4815f6b2422f52a7cb0e0f) --- www/foreign-cdm/Makefile | 35 +++++++++++++++++++-------------- www/foreign-cdm/distinfo | 4 +--- www/foreign-cdm/files/fcdm-setup-env.in | 2 ++ www/foreign-cdm/pkg-plist | 12 ----------- 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/www/foreign-cdm/Makefile b/www/foreign-cdm/Makefile index e6785fb60c92..157c883b316b 100644 --- a/www/foreign-cdm/Makefile +++ b/www/foreign-cdm/Makefile @@ -1,10 +1,9 @@ PORTNAME= foreign-cdm PORTVERSION= 2 +PORTREVISION= 1 CATEGORIES= www multimedia linux -MASTER_SITES= https://arrowd.name/:cdm \ - https://dl.google.com/linux/deb/pool/main/g/google-chrome-stable/:widevine -DISTFILES= cdm-${CDM_INT_HASH}.tar.gz:cdm \ - google-chrome-stable_${CHROME_VERSION}_amd64.deb:widevine +MASTER_SITES= https://arrowd.name/:cdm +DISTFILES= cdm-${CDM_INT_HASH}.tar.gz:cdm MAINTAINER= arrowd@FreeBSD.org COMMENT= CDM agent for Chromium @@ -27,25 +26,31 @@ GH_TUPLE= capnproto:capnproto:928c8390d4d562bd32dc79a42eb64e9bdba572d8:capnproto MAKE_ENV= LINUX_CC=/compat/linux/opt/rh/devtoolset-11/root/usr/bin/g++ \ MAKE_JOBS_NUMBER=${MAKE_JOBS_NUMBER} -CHROME_VERSION= 116.0.5845.179-1 +SUB_FILES= fcdm-setup-env + +PLIST_FILES= libexec/fcdm-worker \ + lib/foreign-cdm/fcdm-fbsd.so \ + share/chromium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so \ + share/chromium/WidevineCdm/manifest.json \ + share/foreign-cdm/fcdm-setup-env + CDM_INT_HASH= fef0b5aa1bd31efb88dfab804bdbe614f3d54f28 post-extract: ${MV} ${WRKDIR}/*.h ${WRKSRC}/third_party/cdm/ - cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} data.tar.xz ${EXTRACT_AFTER_ARGS} do-install: - ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/bin - ${INSTALL_PROGRAM} ${WRKSRC}/build/fcdm-worker ${STAGEDIR}${LINUXBASE}/usr/bin + ${INSTALL_PROGRAM} ${WRKSRC}/build/fcdm-worker ${STAGEDIR}${PREFIX}/libexec/ + + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/fcdm-setup-env ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/foreign-cdm - ${MV} ${WRKSRC}/build/fcdm-fbsd.so ${STAGEDIR}${PREFIX}/lib/foreign-cdm/ - ${MKDIR} ${STAGEDIR}${PREFIX}/share/chromium - ${MV} ${WRKDIR}/opt/google/chrome/WidevineCdm ${STAGEDIR}${PREFIX}/share/chromium/ - ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/foreign-cdm - ${MV} ${STAGEDIR}${PREFIX}/share/chromium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so ${STAGEDIR}${LINUXBASE}/usr/lib/foreign-cdm + ${CP} ${WRKSRC}/build/fcdm-fbsd.so ${STAGEDIR}${PREFIX}/lib/foreign-cdm/ + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/foreign-cdm/fcdm-fbsd.so -post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/chromium/WidevineCdm/_platform_specific/linux_x64 ${LN} -s ${PREFIX}/lib/foreign-cdm/fcdm-fbsd.so ${STAGEDIR}${PREFIX}/share/chromium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/foreign-cdm/fcdm-fbsd.so + ${LN} -s ${PREFIX}/lib/WidevineCdm/manifest.json ${STAGEDIR}${PREFIX}/share/chromium/WidevineCdm/manifest.json .include diff --git a/www/foreign-cdm/distinfo b/www/foreign-cdm/distinfo index 892668884386..786ccc10b6b8 100644 --- a/www/foreign-cdm/distinfo +++ b/www/foreign-cdm/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1696359943 +TIMESTAMP = 1696769052 SHA256 (cdm-fef0b5aa1bd31efb88dfab804bdbe614f3d54f28.tar.gz) = 178ae15061d67943fa754e9ddf1903536c4cdb813dcdd90f98007f6238781a26 SIZE (cdm-fef0b5aa1bd31efb88dfab804bdbe614f3d54f28.tar.gz) = 14361 -SHA256 (google-chrome-stable_116.0.5845.179-1_amd64.deb) = 75d091c547b4f336c88e45c61ba8b7a6fddb869034122b3ffe0ed60225c389b4 -SIZE (google-chrome-stable_116.0.5845.179-1_amd64.deb) = 96683480 SHA256 (shkhln-foreign-cdm-2-760e440839f4456373460dcb61cfa8e36618d310_GH0.tar.gz) = 394faa92a8957f858561308638370098fd7e3d30301f8791380520003f19a08e SIZE (shkhln-foreign-cdm-2-760e440839f4456373460dcb61cfa8e36618d310_GH0.tar.gz) = 11776 SHA256 (capnproto-capnproto-928c8390d4d562bd32dc79a42eb64e9bdba572d8_GH0.tar.gz) = 5c867f4758d7a3e2e0213e732e2b9a5ad70d1193a4d615bbab41df1d4051de37 diff --git a/www/foreign-cdm/files/fcdm-setup-env.in b/www/foreign-cdm/files/fcdm-setup-env.in new file mode 100644 index 000000000000..1bc9c3cb400b --- /dev/null +++ b/www/foreign-cdm/files/fcdm-setup-env.in @@ -0,0 +1,2 @@ +export FCDM_CDM_SO_PATH=%%PREFIX%%/lib/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so +export FCDM_WORKER_PATH=%%PREFIX%%/libexec/fcdm-worker diff --git a/www/foreign-cdm/pkg-plist b/www/foreign-cdm/pkg-plist deleted file mode 100644 index 6cc85c8b69bd..000000000000 --- a/www/foreign-cdm/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -/compat/linux/usr/bin/fcdm-worker -/compat/linux/usr/lib/foreign-cdm/libwidevinecdm.so -lib/foreign-cdm/fcdm-fbsd.so -share/chromium/WidevineCdm/LICENSE -share/chromium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so -share/chromium/WidevineCdm/manifest.json -@dir /compat/linux/usr/bin -@dir /compat/linux/usr/lib/foreign-cdm -@dir /compat/linux/usr/lib -@dir /compat/linux/usr -@dir /compat/linux -@dir /compat