From nobody Mon Sep 30 14:08:36 2024 X-Original-To: dev-commits-ports-all@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 4XHNGD4PkJz5X8jN; Mon, 30 Sep 2024 14:08:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHNGD1twgz4P1m; Mon, 30 Sep 2024 14:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727705316; 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=xLGagnxR+SHQ8Xemd0IUrXms3ADObu1A4hyegrxGzYw=; b=lzVXUDN9ta3sqEtS84mhCCa3i/C8tO6pC+vyt/3XYbhNJelCquuoITABR8D9/fn3kMi/6C ewu2bbCSKCn0WfPaJ/XpixH/IXqflqehXeajnzu8ddthK0V3dO5jSLtpvN2XVyuNxQiVGk +mOmCM1Flv7AOnigULaPcnbpPE2HgBdPXhT3/j4Io274eBaL4s+CvEhkIlUhld8t6VJPQO ptDixsZY8QwwYiWyIbhTi4n1asi5CSKIy4evMB131OaHebDBtfaEJNKAZK9Reu/labCm7n 9xMuD6YT4mY2I2Yv+eAzAqApwraPCzSBPr11zsghuitaN7d3+hXW+zEC1GuWOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727705316; 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=xLGagnxR+SHQ8Xemd0IUrXms3ADObu1A4hyegrxGzYw=; b=XmWiwgZmC0CS8AkVgNOj6ELpRNt0lxDtGtdyrrzPL8nmmndO9zWM33oGPsZ7/mA/h8lYZa XtidJ6INMijszbo/L/8liWWgyW+uqtu6kPOZwmqpLpeFdN2Qq/QgquXKo+CYz2Gv6Lc2jU uFima36Ci36/pU3dwUVId4Zo0I2M2EhKHYn5nq9biTorCIhkSEUx3buqzLL+Jz4hND3SRb cOZLOkL1nTyEqldDFFl4qjbGCcFhi9KCtaZXNzvN3I1fYYY3ilQ/0U6NwiU8rFXxbIPBQw MQbAMiFg3hU/2BxvHQ7zRyExppXSdRutfTDrMBQ25DI4ObM1DpXbqAKIeDKseA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727705316; a=rsa-sha256; cv=none; b=igmzhO4tX4r9G+RExlC547RcTGxfIFbDMoNwrHB+IEIEgLPNKTmtVpNwHJe3FrOj7SX3XW 3myBAuQHI7ewG+XAmEmheEj2wxkouo4g31hS7FhQb/jQZVaiEpgQPLYONInjGTJ4QTDRAp SH/RQ8V1u2/fm9qA22shGSzfqz5D2yzk09D9nNkIdF0Q3f3joUiVvd52pgTH1kQkyaOSVe sh+vQjPZWpLpKdvZZaNcL7bPEAbDwcJ43RtPz0aPgcvoUoA8Bflx6QoiRrTRAq5QkeBeiy fPTGAiWnddTyhqr0VXvvw7Rs4lDTTj1V1X/h+1tYAKQLj/c0zp3Xsh7SI/s6aw== 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 4XHNGD0qYBzwxV; Mon, 30 Sep 2024 14:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UE8a21071936; Mon, 30 Sep 2024 14:08:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UE8aAS071933; Mon, 30 Sep 2024 14:08:36 GMT (envelope-from git) Date: Mon, 30 Sep 2024 14:08:36 GMT Message-Id: <202409301408.48UE8aAS071933@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: eedd4aeb9ae4 - main - graphics/blender: fix build on aarch64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eedd4aeb9ae454f0c63baa659394d83e8b959b3b Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=eedd4aeb9ae454f0c63baa659394d83e8b959b3b commit eedd4aeb9ae454f0c63baa659394d83e8b959b3b Author: Robert Clausecker AuthorDate: 2024-09-26 12:42:12 +0000 Commit: Robert Clausecker CommitDate: 2024-09-30 14:01:57 +0000 graphics/blender: fix build on aarch64 - add an extra path for CPU detection via elf_aux_info() Approved by: portmgr (build fix blanket) --- graphics/blender/files/patch-extern_lzma_CpuArch.c | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/graphics/blender/files/patch-extern_lzma_CpuArch.c b/graphics/blender/files/patch-extern_lzma_CpuArch.c new file mode 100644 index 000000000000..d2a6b4d51b7d --- /dev/null +++ b/graphics/blender/files/patch-extern_lzma_CpuArch.c @@ -0,0 +1,37 @@ +--- extern/lzma/CpuArch.c.orig 2024-09-26 11:32:05 UTC ++++ extern/lzma/CpuArch.c +@@ -766,6 +766,25 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP + + #ifdef USE_HWCAP + ++#ifdef __FreeBSD__ ++ ++ #define MY_HWCAP_CHECK_FUNC_3(name1, name2, at) \ ++ BoolInt CPU_IsSupported_ ## name1() { \ ++ unsigned long vec = 0; \ ++ elf_aux_info(AT_ ## at, &vec, sizeof(vec)); \ ++ return (vec & (at ## _ ## name2)) ? 1 : 0; \ ++ } ++ ++#ifdef MY_CPU_ARM64 ++ #define MY_HWCAP_CHECK_FUNC(name) MY_HWCAP_CHECK_FUNC_3(name, name, HWCAP) ++ MY_HWCAP_CHECK_FUNC_3(NEON, ASIMD, HWCAP) ++#elif defined(MY_CPU_ARM) ++ #define MY_HWCAP_CHECK_FUNC(name) MY_HWCAP_CHECK_FUNC_3(name, name, HWCAP2) ++ MY_HWCAP_CHECK_FUNC_3(NEON, NEON, HWCAP) ++#endif ++ ++#else // __FreeBSD__ ++ + #include + + #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \ +@@ -781,6 +800,8 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP + BoolInt CPU_IsSupported_ ## name() { return (getauxval(AT_HWCAP2) & (HWCAP2_ ## name)) ? 1 : 0; } + MY_HWCAP_CHECK_FUNC_2(NEON, NEON) + #endif ++ ++#endif // __FreeBSD__ + + #else // USE_HWCAP +