Date: Wed, 01 Apr 2026 13:24:00 +0000 From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a218714bf5db - main - multimedia/jellyfin: simplify tarball generation and verification Message-ID: <69cd1c70.210f4.5638800d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a218714bf5dbd9082939aff52ca32d8508105c07 commit a218714bf5dbd9082939aff52ca32d8508105c07 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2026-04-01 10:43:36 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2026-04-01 13:23:53 +0000 multimedia/jellyfin: simplify tarball generation and verification --- multimedia/jellyfin/Makefile | 29 +++++++++++------------------ multimedia/jellyfin/distinfo | 4 +--- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/multimedia/jellyfin/Makefile b/multimedia/jellyfin/Makefile index 74195d0f0d8d..99a2333fbee2 100644 --- a/multimedia/jellyfin/Makefile +++ b/multimedia/jellyfin/Makefile @@ -49,34 +49,29 @@ GROUPS= jellyfin DOTNET_ENV= DOTNET_CLI_HOME=/tmp #json files must be replaced every time DISTVERSION is updated -PREFETCH_FILE= ${PORTNAME}-${DISTVERSION}-node${NODEJS_VERSION}-modules${EXTRACT_SUFX} PREFETCH_TIMESTAMP= 61171200 DOTNET_RUNTIME= ${OPSYS:tl}.${OSREL:R}-${ARCH:S|amd64|x64|:C|aarch64|arm64|} .include "nuget.mk" -# We need ARCH to be defined, which can only happen after options.mk -.include <bsd.port.options.mk> - -.if ${ARCH} == amd64 || make(makesum) +# Always list both arch tarballs in DISTFILES so make makesum checksums both. +# Only extract the one matching the current ARCH. FILE_AMD64= ${PORTNAME}-${DISTVERSION}-node${NODEJS_VERSION}-amd64-modules.tar.gz -DISTFILES+= ${FILE_AMD64}:prefetch -EXTRACT_ONLY+= ${FILE_AMD64} -COMBIARCH+= x64 ${FILE_AMD64} -.endif - -.if ${ARCH} == aarch64 || make(makesum) FILE_ARM64= ${PORTNAME}-${DISTVERSION}-node${NODEJS_VERSION}-arm64-modules.tar.gz -DISTFILES+= ${FILE_ARM64}:prefetch +DISTFILES+= ${FILE_AMD64}:prefetch ${FILE_ARM64}:prefetch + +.include <bsd.port.options.mk> + +.if ${ARCH} == amd64 EXTRACT_ONLY+= ${FILE_AMD64} -COMBIARCH+= arm64 ${FILE_ARM64} +.elif ${ARCH} == aarch64 +EXTRACT_ONLY+= ${FILE_ARM64} .endif -# We need NODEJS_VERSION to be expanded before assigning it so MAKESUM_DEP and NODEJS_VERSION -# is only expanded after pre.mk +# We need NODEJS_VERSION to be expanded before assigning it .include <bsd.port.pre.mk> -.for c f in ${COMBIARCH} +.for c f in x64 ${FILE_AMD64} arm64 ${FILE_ARM64} ${DISTDIR}/$f: ${MKDIR} ${WRKDIR}/ui/node-modules-cache; \ ${CP} -R ${FILESDIR}/packagejsons/* ${WRKDIR}/ui/node-modules-cache; \ @@ -133,5 +128,3 @@ post-install: >${STAGEDIR}${PREFIX}/etc/libmap.d/jellyfin.conf .include <bsd.port.post.mk> - -makesum: ${PREFETCH_DEP} diff --git a/multimedia/jellyfin/distinfo b/multimedia/jellyfin/distinfo index d9321b8ea92e..39ed193238eb 100644 --- a/multimedia/jellyfin/distinfo +++ b/multimedia/jellyfin/distinfo @@ -1,6 +1,4 @@ -TIMESTAMP = 1769843535 -SHA256 (jellyfin-10.11.6-node24-modules.tar.gz) = 7591a3a3aae2af87d241f3b35916db258a121d23b976acdd79623d9db83b05f9 -SIZE (jellyfin-10.11.6-node24-modules.tar.gz) = 456783570 +TIMESTAMP = 1775040130 SHA256 (nuget/asynckeyedlock.7.1.8.nupkg) = 3e457cc7d1ef200c69a5d26b601834cd8ea875b56cf52e9f86a816f99b61580e SIZE (nuget/asynckeyedlock.7.1.8.nupkg) = 401877 SHA256 (nuget/autofixture.4.18.1.nupkg) = ade3fe6a86223dc223e066c22218dde7f3a1b9654b0ad0f884ab8b3c77b61172home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cd1c70.210f4.5638800d>