From nobody Sun Aug 7 07:09:29 2022 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 4M0r6x58x7z4Y1fh; Sun, 7 Aug 2022 07:09:29 +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 4M0r6x4Svrz3tL9; Sun, 7 Aug 2022 07:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659856169; 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=CKGc2uLEgkX/RDaDUmMRTrOgkG5wDMQNArjo4Lw67U8=; b=NqiBK9MatiLjP4JSjlX3Hu1/vPh6SCI+omTlpLvvM/xdkBDy5YfNrwclUNYkRnpKTVp7PC a8E/mC1v96GjgqTI71600uj/0f0bYHi2w+Cmr3yltgmntXgiJBmZ1wEsS2MoV2hnylUjmt djhrnt+hbQsnptTl9sXrfLpwciwXEoqMPHzw5qy3ZSv7rlGa1BA9PM8BodC57tHsR4L2FG FpFk7tfl7zDrzHp+tqSNhuI5EBcNJkCS/I2VIGK5s7Qdmd/FhGwdov6HvTNQw1tGDT5WKU axl8XpPSFHU9g8PHob2f5ez1zphLflJaC/pBzLBs2pZagH/bFi0J3PVRPEKwLg== 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 4M0r6x3XhBz13gv; Sun, 7 Aug 2022 07:09:29 +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 27779TKE064275; Sun, 7 Aug 2022 07:09:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27779TK5064274; Sun, 7 Aug 2022 07:09:29 GMT (envelope-from git) Date: Sun, 7 Aug 2022 07:09:29 GMT Message-Id: <202208070709.27779TK5064274@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Felix Palmen Subject: git: 88ac87ec1940 - 2022Q3 - multimedia/makemkv: Add support for aarch64 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 88ac87ec19400f3f17078f4b8874cf76ff45012f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659856169; 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=CKGc2uLEgkX/RDaDUmMRTrOgkG5wDMQNArjo4Lw67U8=; b=H/2cs9flkG3YkyGt+RUCsNspNcpYIa0G2TJV7UGc0xZ5Ad5cxJwIXPE5N99PylwbcE9XRy mJ3F0XOOa1YcgbPbCAucvXazqw4wo2iIeK4+IrfhcUKBC7KW18vOUB7nSERm652qEZU8Ov uK94RW7m6VXyGiJNeEhtqbRvNEZ6MkpaOIZU6BnjK5/lZ5N1ydFqhnL3rdqpCka//ppxqU jAsJ2G4pcGYFFGJgOlTpuoGH51HAEtK14BzmcxNz9pPWAB8HhyyacOBI3XiYcdb43wxxfn Cq0HMF8xCaAREXogXh5WMLogZzqxKfGJlu8F+5a8W0fXgvMgyfAeQKjSznG0+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659856169; a=rsa-sha256; cv=none; b=HbR8CxOjj8fFIZ0oi1KtE393ZlMns6l5YvK028sm6HD9ujGAZ/Un4HsI99Y9HDprAidL3v rQRYL2N3L6Y2JOhkDuQpo9yuEkV0ZdKeCMRZE8qO6RYzWv8g8e3ZpD+LIaYxlrneX54PHz 3ffDXofaAdsqnz0L7DJELly8wwqpUY3xqLJsp+nPqTdHcHOXYirxChA7M+RuIf8jB2HZvE TxTXGRaB943+5mQUNcbhzQPhMUMkg3Hqd3VPgJcUEFlq7kYsQyCU3C8JjC2LEHRphuxqi3 kjRnLPH+PL0W+ysmJaUvTelSXOh9pLccD7229fV4XlDmU7HZ5q4VeVO8DmzQJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=88ac87ec19400f3f17078f4b8874cf76ff45012f commit 88ac87ec19400f3f17078f4b8874cf76ff45012f Author: Felix Palmen AuthorDate: 2022-07-08 14:39:44 +0000 Commit: Felix Palmen CommitDate: 2022-08-07 07:07:30 +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 (cherry picked from commit b6dbfbcad02d129721037a005420e0bef8df2885) --- 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}