From nobody Fri Jul 08 14:50:44 2022 X-Original-To: dev-commits-ports-main@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 3A3E417D50D4; Fri, 8 Jul 2022 14:50:45 +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 4Lfbn11FRPz3pZs; Fri, 8 Jul 2022 14:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657291845; 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=CuOXrJsvvLarUZN0MxjcE1xrr5PMWGZ7rvwsc+MU1Xc=; b=pc/AZIhbHmBuQlhTAfeT723pzDo1itahxLc/+SDrr1eHuuzS99K1qI6GAjWkGaUovaNGj/ aUmWs3XjROunugHAn+hYN2UADu1P1OfSXPOToQ3s9qKamjH4uxFQ0nATybZJU153nX2Rec vXoiefPDoYUn4DLbMJsrHGzqz8pnup9m8tDsq7rB7COUpUilUKeUPP6XDI7MfhScesTHie 0IfongMD65XVztXFYxtGfHYcO3lx9hBWWEWTTMpmSxeW0p4lhJD3EaRjadnSfGXfX3Ry7E JvGUnK5N6q2xDIkRsuCqEvcqIaIJhprSpDepYvvHNniE0cvYdNB9AlVrhaLYPg== 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 4Lfbn10DyGz1Phg; Fri, 8 Jul 2022 14:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 268Eoi4C029643; Fri, 8 Jul 2022 14:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Eoir9029642; Fri, 8 Jul 2022 14:50:44 GMT (envelope-from git) Date: Fri, 8 Jul 2022 14:50:44 GMT Message-Id: <202207081450.268Eoir9029642@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: b6dbfbcad02d - main - multimedia/makemkv: Add support for aarch64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6dbfbcad02d129721037a005420e0bef8df2885 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657291845; 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=CuOXrJsvvLarUZN0MxjcE1xrr5PMWGZ7rvwsc+MU1Xc=; b=sAUmUG2eYFIPCqX+Aycw9manWIM3RAHccIXHAH0bM/7QW/YLcCLsQT3pL5Lm81OjCQW/C/ Wb/PD6QD2+7CtDmY2VFfeCWStOZP3N73ZVx28pLkZU4eciWB7DTH32G/0zlw2CGHvqvEfA j7KjkAtTO4CzacWmCnbB3MOduOxYkzQm7DIlzLH56YPDM6DNwBEDwkDfAp9Yaq0ge9H6CF 5/6tuKGQAvKnxLB2klP6clZwf2l/+fmnlbbkUuOSWccK1TFk0RitWSZlvbOomrTA9YK1yF Al0m+lp0QWBp7kMdqQci0cvFfWGxrkfyqfJbWQIm06JebmUL/1ioVokD2mILYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657291845; a=rsa-sha256; cv=none; b=H/hHxmv3Yg44REZgldxbxrc3bAU4GMyBbhDTRtzwJSnQDP+6e2KC9ilOZ2A+Fp+hyq/zVs 0umQa0NdzmOc+0KVYX7Jv7L+sWCmN0IhRMqPd1ycUU32KLvvKALHzD12tweDJRHPcN6bK8 4LA19wbEPS3AeePnBqQweoufu2dmuq8cr99Z1vdT0/8awWzGKu9FKbVQ3TsFE9/ibvX+tY M7RRD+jPQLycPXyXJhgDvkDuPtIzzrfg1phdNz1ARf56wzbin8FgpWXcIacAw0dpQzjz/3 FmbVj0DSnfA/dNg82UqUiKhgugj86UP66XZQYg1GPCvi+sGxYVOR86Kbn2GB2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6dbfbcad02d129721037a005420e0bef8df2885 commit b6dbfbcad02d129721037a005420e0bef8df2885 Author: Felix Palmen AuthorDate: 2022-07-08 14:39:44 +0000 Commit: Mikael Urankar CommitDate: 2022-07-08 14:39:44 +0000 multimedia/makemkv: Add support for aarch64 Upstream started to provide the (closed-source) makemkvcon binary for armv6/armv7 and aarch64 as well. For aarch64, we have the required linux-c7 userland, so let's enable this architecture. Differential Revision: https://reviews.freebsd.org/D35757 --- multimedia/makemkv/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index de99a7868300..a3cde7db9ea6 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -37,13 +37,14 @@ LICENSE_DISTFILES_OpenSSL= openssl-${OPENSSLFULLVER}.tar.gz LICENSE_DISTFILES_MAKEMKV= makemkv-bin-${PORTVERSION}.tar.gz \ makemkv-oss-${PORTVERSION}.tar.gz -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 i386 USES= gmake linux pkgconfig perl5 USE_LINUX= base expat expat:build openssl openssl:build devtools:build USE_PERL5= build -BUILD_DEPENDS= nasm>0:devel/nasm \ - ${LOCALBASE}/include/expat.h:textproc/expat2 \ - patchelf>0:sysutils/patchelf +BUILD_DEPENDS= ${LOCALBASE}/include/expat.h:textproc/expat2 \ + patchelf>0:sysutils/patchelf \ + ${BUILD_DEPENDS_${FFMPEGARCH}} +BUILD_DEPENDS_x86= nasm>0:devel/nasm WRKSRC= ${WRKDIR}/makemkv-oss-${PORTVERSION} @@ -61,8 +62,9 @@ OPENSSLFULLVER= ${OPENSSLVERSION}${OPENSSLPATCHLEVEL} LINUXARCH= ${ARCH:S/amd64/x86_64/} LINUXTRIPLET= ${LINUXARCH}-redhat-linux -LINUXLIBDIR= ${LINUXBASE}/${"${LINUXARCH:Mx86_64}" != "":?lib64:lib} -OPENSSLTARGET= ${"${LINUXARCH:Mx86_64}" != "":?linux-x86_64:linux-elf} +LINUXLIBDIR= ${LINUXBASE}/${"${LINUXARCH:Mi386}" != "":?lib:lib64} +OPENSSLTARGET= linux-${LINUXARCH:S/i386/elf/} +FFMPEGARCH= ${"${LINUXARCH:Maarch64}" != "":?aarch64:x86} OPTIONS_DEFINE= EXAMPLES @@ -114,6 +116,8 @@ post-patch: -e 's:x86_64:amd64:' \ -e 's:i686:i386:' \ -e 's:-t \([^ ]*\) \([^ ]*\):\2 \1:' \ + -e 's:ARCH=:BINARCH=:' \ + -e 's:bin/$$(ARCH:bin/$$(BINARCH:' \ ${WRKDIR}/makemkv-bin-${PORTVERSION}/Makefile pre-configure: @@ -139,7 +143,7 @@ pre-configure: --cross-prefix=${LINUXTRIPLET}- --arch=${LINUXARCH} \ --target-os=linux --host-cc=${CC}; \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ - ${MAKE_CMD} ${_MAKE_JOBS} V=1 ARCH=x86 all install + ${MAKE_CMD} ${_MAKE_JOBS} V=1 ARCH=${FFMPEGARCH} all install # OpenSSL headers cd ${WRKDIR}/openssl-${OPENSSLFULLVER}; \ ./Configure --openssldir= --prefix=/usr ${OPENSSLTARGET}