From nobody Wed Jan 1 12:25:14 2025 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 4YNTZ24KDzz5jsFq; Wed, 01 Jan 2025 12:25:14 +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 4YNTZ23YSlz4tqj; Wed, 1 Jan 2025 12:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735734314; 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=kV3Lhh/WxWV+KBBLb7nWlp0ZPix0rVK3SdLXGkGRInA=; b=jIGb5LoQ+QGDqbhrzpp280QDc1e/vAL1nLEuY38prrR4Hbsq5ZtMfBohzM6cUslYZjr33k chw8PoOTAPwOaEGpDcU1y6u99rSBsZCMC9T6aoeqJsp7OZYuM+Z2S0UFw2FkHFht/hqxcw Bbbn4nSKBch/oCtV7zG0d0G5hNR8j9S8lIokJqclbbAq0y6u7xQ2+QXy+wKuVAF4vn+sd5 fDesK9dZUcJkpENNklf++B3Kx1s2rpQtTP4vixXZAAm/niDcPWNzpdLS6BckB/itWh9Guh B2+gH/8RvWhd8O4vIScO5xgTAPZ9I5cBo3ZJFWB9WOQkUYndT0AJji4/NDEj0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735734314; 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=kV3Lhh/WxWV+KBBLb7nWlp0ZPix0rVK3SdLXGkGRInA=; b=W6YqRE5r0zGsxAUcH4tt0xBGvAQVtVil7jcSfAF7ij7s61C0bJ9/IswrL2oKgu4oLdNGW1 rmo2+qDO1ZrUTGiLaIiDQ/3Y1aw689g+4izmCuRW75DqRYB1c/QXUIiMslMCC16VJ11whK Ux4qI5LclSM1nShGc39q+Xtibz9CrILa4IGB62c77Bw0hOkl6CW9L8JbGjZdDNDIHWUmDY KQOV9bus4iSu+DjEYQ+15T4h642dBK6hQ54p5jTrKvLnuCN8I1yEf2yFv3lCsw1HKLu1FA 33X4d5hPI5x5GCIHlJIqJZDL2OSRL9oBxOtqWvIaBnKxJwsGZXu5Ln1N2DED9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735734314; a=rsa-sha256; cv=none; b=wMfr3ykwpUFXV/Lzt66ceQDYWOvxeOPiqjYi5yA0UxqOdox54V2UQ+vpZYXxQj7f/5kRBg JlS+4l4w+T1QRNo6SXU3j+cwMcv6I1N3h7TQo2ebhjOhIh4SkNv4bsiZNWHt4jRYMontgx onJOFlCh2ij9hVRrja+Je/F8LIwTKoh48d46dEGZK06IPXN+6ruNFcb11bLQft5VaAGy8W h9NPdQIK6+Rd+kZAws8szEHf/b/b288JOCOgTc6/LxqsMwvuaE/N68LgVI+jBgwYppnClh CNrL0j6xOMYVXFdl8Iyb+JVBiQ/CWRwoZa0jnG8XeHEAL3XW49a7LD3NoxH1gA== 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 4YNTZ238NszP9L; Wed, 1 Jan 2025 12:25:14 +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 501CPECb090196; Wed, 1 Jan 2025 12:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501CPEUL090193; Wed, 1 Jan 2025 12:25:14 GMT (envelope-from git) Date: Wed, 1 Jan 2025 12:25:14 GMT Message-Id: <202501011225.501CPEUL090193@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: af603fd69c6b - main - audio/sfizz: fix build on aarch64 / armv7 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: af603fd69c6b2846915f7e355f08b5fec891ac3f Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=af603fd69c6b2846915f7e355f08b5fec891ac3f commit af603fd69c6b2846915f7e355f08b5fec891ac3f Author: Robert Clausecker AuthorDate: 2024-12-29 13:18:41 +0000 Commit: Robert Clausecker CommitDate: 2025-01-01 12:24:55 +0000 audio/sfizz: fix build on aarch64 / armv7 Add code path for querying the ELF aux vectors on FreeBSD. Approved by: portmgr (build fix blanket) MFH: 2024Q4 Event: 38C3 --- audio/sfizz/Makefile | 2 -- ...puid_src_cpuid_detail_init__linux__gcc__arm.hpp | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/audio/sfizz/Makefile b/audio/sfizz/Makefile index e53583c195d0..094ae7cb05fd 100644 --- a/audio/sfizz/Makefile +++ b/audio/sfizz/Makefile @@ -9,8 +9,6 @@ WWW= https://sfz.tools/sfizz/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= compilation fails: fatal error: 'linux/auxvec.h' file not found, see https://github.com/steinwurf/cpuid/issues/65 - LIB_DEPENDS= libabsl_hash.so:devel/abseil RUN_DEPENDS= zenity:x11/zenity diff --git a/audio/sfizz/files/patch-src_external_cpuid_src_cpuid_detail_init__linux__gcc__arm.hpp b/audio/sfizz/files/patch-src_external_cpuid_src_cpuid_detail_init__linux__gcc__arm.hpp new file mode 100644 index 000000000000..2998fa8fce25 --- /dev/null +++ b/audio/sfizz/files/patch-src_external_cpuid_src_cpuid_detail_init__linux__gcc__arm.hpp @@ -0,0 +1,28 @@ +--- src/external/cpuid/src/cpuid/detail/init_linux_gcc_arm.hpp.orig 2024-12-29 13:01:01 UTC ++++ src/external/cpuid/src/cpuid/detail/init_linux_gcc_arm.hpp +@@ -11,7 +11,11 @@ + + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include + + #include "cpuinfo_impl.hpp" +@@ -28,6 +32,13 @@ void init_cpuinfo(cpuinfo::impl& info) + // (64-bit ARM). Note that /proc/cpuinfo will display "asimd" instead of + // "neon" in the Features list on a 64-bit ARM CPU. + info.m_has_neon = true; ++#elif defined(__FreeBSD__) ++ // armv7 FreeBSD ++ long hwcap = 0; ++ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ ++ info.m_has_neon = hwcap & HWCAP_NEON; + #else + // Runtime detection of NEON is necessary on 32-bit ARM CPUs + //