From nobody Tue Dec 28 14:44:51 2021 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 2F366190F093; Tue, 28 Dec 2021 14:44:52 +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 4JNckq6YYLz4cg9; Tue, 28 Dec 2021 14:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C250C1372F; Tue, 28 Dec 2021 14:44:51 +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 1BSEipa9000315; Tue, 28 Dec 2021 14:44:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSEipMv000314; Tue, 28 Dec 2021 14:44:51 GMT (envelope-from git) Date: Tue, 28 Dec 2021 14:44:51 GMT Message-Id: <202112281444.1BSEipMv000314@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: b6bf306d87ea - main - archivers/7-zip: Update to 21.07 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: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6bf306d87ea3b01bbdeb47688b2456fdca04ad7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640702691; 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=UfXkmNAXzYDf1tS/R0mu6vIi30cX6v16X/DEtZOMC84=; b=NEtkBphVYBAAXeoN/tnO2IMvm8fibX9TNA9xoNjvaG/GCQ1lGX07NWHfpmQzy1c4VMAN/P 5fPgp1LPljHXxB2OiYz8uiH9szB+eKU3VvK3GrOCe5fu48FSGWy7v+hDC1PcwsItFjasen pWD57i89lIAuj3D2cAMgXwSrDrdqju3zI2n+II5Ahlv9kC33smTvW2viooY5386sHe1ljZ 0VBtXbQN0jksHW1iUvno7sQD9Enior2/mCtVv+OXAChZB2auBVnAuJrXGdl7qQbaoOzrYS S41B7cCCShTsCo3vVpWf6ksuxnxt40iAppNhm8xM4iSt+xQ8NkHUlR5Sws0yrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640702691; a=rsa-sha256; cv=none; b=yRxepPISqXdQutYkG0dxqT9NQ0BOHOt6oq6uN9pmlknk3MuLG4Ks3FHswStPdfEA9MlxY7 8XNphqskmL7eKGUVRubd6BPyKYptnto3oSyfyZJpSecfGj+4QAhTXKoTkO1DoQHycUiPh3 NwbU/BkOFJlhptE+f5VB0h7J+uYDNbZsxRdAeMQx1XkPHPs+PCIoP0EsMDxjvXfOWi2ldu YdBN5UvCSbbfOjUUx9i85UK0x8Zx7bRUGqdnSeRcMZFlA0fgxVIm7pK1Q1U6ttFRSvf5oY DLStBr4KKc5RpL9cLx8hn5u4PaF4GPsBtcT8DyCX0WhxQxSwOPZNo5DT4ExR1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6bf306d87ea3b01bbdeb47688b2456fdca04ad7 commit b6bf306d87ea3b01bbdeb47688b2456fdca04ad7 Author: Max Brazhnikov AuthorDate: 2021-12-28 14:32:52 +0000 Commit: Max Brazhnikov CommitDate: 2021-12-28 14:32:57 +0000 archivers/7-zip: Update to 21.07 Merge patches to fix build on arm64 [1]. PR: 260329 [1] Reported by: diizzy@ Submitted by: mikael@ --- archivers/7-zip/Makefile | 6 ++-- archivers/7-zip/distinfo | 6 ++-- .../7-zip/files/patch-CPP_Windows_SystemInfo.cpp | 11 ++++++- archivers/7-zip/files/patch-C_CpuArch.c | 34 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/archivers/7-zip/Makefile b/archivers/7-zip/Makefile index d40fb1080e21..8a7f59629053 100644 --- a/archivers/7-zip/Makefile +++ b/archivers/7-zip/Makefile @@ -1,6 +1,5 @@ PORTNAME= 7-zip -DISTVERSION= 21.06 -PORTREVISION= 1 +DISTVERSION= 21.07 CATEGORIES= archivers MASTER_SITES= https://www.7-zip.org/a/ DISTNAME= 7z${DISTVERSION:S/.//}-src @@ -28,7 +27,8 @@ MAKE_ARGS= LOCAL_FLAGS="${CFLAGS}" \ NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Bundles/Alone2 -DOS2UNIX_FILES= CPP/7zip/7zip_gcc.mak \ +DOS2UNIX_FILES= C/CpuArch.c \ + CPP/7zip/7zip_gcc.mak \ CPP/7zip/var_gcc.mak \ CPP/Windows/SystemInfo.cpp diff --git a/archivers/7-zip/distinfo b/archivers/7-zip/distinfo index 3e4e5ddbc137..2b0234a96661 100644 --- a/archivers/7-zip/distinfo +++ b/archivers/7-zip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639126647 -SHA256 (7z2106-src.7z) = 675eaa90de3c6a3cd69f567bba4faaea309199ca75a6ad12bac731dcdae717ac -SIZE (7z2106-src.7z) = 1215031 +TIMESTAMP = 1640701508 +SHA256 (7z2107-src.7z) = d1074d56f415aab99d99e597a7b66dc455dba6349ae8a4c89df76475b6a1284c +SIZE (7z2107-src.7z) = 1219373 diff --git a/archivers/7-zip/files/patch-CPP_Windows_SystemInfo.cpp b/archivers/7-zip/files/patch-CPP_Windows_SystemInfo.cpp index bc362d111086..1f99e0c5da91 100644 --- a/archivers/7-zip/files/patch-CPP_Windows_SystemInfo.cpp +++ b/archivers/7-zip/files/patch-CPP_Windows_SystemInfo.cpp @@ -1,4 +1,4 @@ ---- CPP/Windows/SystemInfo.cpp.orig 2021-12-10 11:30:40 UTC +--- CPP/Windows/SystemInfo.cpp.orig 2021-12-28 14:08:56 UTC +++ CPP/Windows/SystemInfo.cpp @@ -20,6 +20,15 @@ @@ -16,3 +16,12 @@ // #undef AT_HWCAP // to debug // #undef AT_HWCAP2 // to debug +@@ -36,7 +45,7 @@ + #endif + */ + +-#ifdef MY_CPU_ARM_OR_ARM64 ++#if defined(MY_CPU_ARM_OR_ARM64) && !defined(__FreeBSD__) + #include + #endif + #endif diff --git a/archivers/7-zip/files/patch-C_CpuArch.c b/archivers/7-zip/files/patch-C_CpuArch.c new file mode 100644 index 000000000000..579b684d4337 --- /dev/null +++ b/archivers/7-zip/files/patch-C_CpuArch.c @@ -0,0 +1,34 @@ +--- C/CpuArch.c.orig 2021-12-12 14:45:15 UTC ++++ C/CpuArch.c +@@ -417,6 +417,23 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP + + #include + ++#if defined(__FreeBSD__) ++static UInt64 get_hwcap() { ++ unsigned long hwcap; ++ if(elf_aux_info(AT_HWCAP, &hwcap, sizeof(unsigned long)) != 0) { ++ return(0); ++ } ++ return hwcap; ++} ++ ++BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap() & HWCAP_CRC32; } ++BoolInt CPU_IsSupported_NEON(void) { return 1; } ++BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap() & HWCAP_SHA1; } ++BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap() & HWCAP_SHA2; } ++BoolInt CPU_IsSupported_AES(void) { return get_hwcap() & HWCAP_AES; } ++ ++#else // __FreeBSD__ ++ + #define USE_HWCAP + + #ifdef USE_HWCAP +@@ -450,6 +467,7 @@ MY_HWCAP_CHECK_FUNC (SHA1) + MY_HWCAP_CHECK_FUNC (SHA2) + MY_HWCAP_CHECK_FUNC (AES) + ++#endif // FreeBSD + #endif // __APPLE__ + #endif // _WIN32 +