From nobody Fri Oct 27 06:35:37 2023 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 4SGtG14LWrz4xrm9; Fri, 27 Oct 2023 06:35:37 +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 4SGtG13LXBz3M6Q; Fri, 27 Oct 2023 06:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388537; 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=ZlNkgJSMW0kk49uK77d6XchMbtxgbPggZ7UEYVqim40=; b=yV2TqHbWccarNxDVg9jtpAVYLndJs/DhRPjCfWH8Y7v6awXFU8ZUFxZiVJaB+5vxpJYM5K ibmCTtzkC72+/HlhGZIoa3mpGb8/elupv/GLkgvUl6SwtmqjeuxfVSV2YACjz8ojuZMZVJ Ntr+Hjeo+vqBXCIijpaXKV0gzdWdKpOzRl/SfEEMqs/bdgCTgZc64S5JIrFQivDdIxnY4t uS6L9GwwffH03JYe3/Lfu5+t+7Td1qQYIsxEletJjDxbG+MLaJ0vbDC2jIF8YjHE2W2hdZ V3cPW2VOzOsJnjxHny7e9yR3j5MlREE5OkO1bZmJI47vjeiGqBsV8pAvJbZlCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388537; 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=ZlNkgJSMW0kk49uK77d6XchMbtxgbPggZ7UEYVqim40=; b=njwGROCOPphfMV5Umrja/hH40wbPbOnheSvY9mPp8aBf0QVY+VJR7W4Gki9GYu8H/VIu9/ xmVsVuS7wDzNzhXZ9P/u74ixtd2nTyroaZjQpLJRkxkgDyMeoLGrmciBHlY4Tn3ksz81JA CFmNe5aoLwxM2aywVPAsnEQhL+jNrwQz2Mxm3b7MULKzs6X9/L4xPliIn8B86t7OWR3kPZ qs9AwrocPi8I9qPYIUq+DgojIt7zA8w+Vf/eV+HtCGWE/GYxo65EH5nYVPsI2wn03V687+ aqKXhH5AkYCMruJ76XnI9eYNfU10NS2BufhLgKC7tMsaIogKvowAUiaIjTcbzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698388537; a=rsa-sha256; cv=none; b=raJb/P5xkjqUV0Fw4Pei1QgIujf3jFRg1S8697eIZ5EhUXjWXi27y46A8847w11NHjZQsZ 468y86sHCiSKeCZXQZHEzmuaOOEYsxGy6qn3KBZbD15lw7zS1KfhCNnwOPngwSbO+yDGao 3DT6Zu+86/SLF6vwBxZhbtinlJj5FmZJMGS8AvCZ/cg9jeGfpnolR3B6Iz3MYb1GMHw6FL dLPcvo2QrQmhQayyC6+qMo4hZuR9y7xIFodTMrVYZbDg4WRYduNXrYmZgibzbX8gjFcWaM DCZbNmqBzjfN5iEqzRD14yE7UYDdhMSWIODNdD2jCzlX32E8vNLtb9I9RWhLUg== 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 4SGtG12Jkhz13BB; Fri, 27 Oct 2023 06:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39R6Zbqw091034; Fri, 27 Oct 2023 06:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R6Zb6a091031; Fri, 27 Oct 2023 06:35:37 GMT (envelope-from git) Date: Fri, 27 Oct 2023 06:35:37 GMT Message-Id: <202310270635.39R6Zb6a091031@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 8eb8cfb22a93 - 2023Q4 - multimedia/ringrtc: fix build on armv7 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 8eb8cfb22a934a283d6ff5a99710c1b2b175adbe Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=8eb8cfb22a934a283d6ff5a99710c1b2b175adbe commit 8eb8cfb22a934a283d6ff5a99710c1b2b175adbe Author: Robert Clausecker AuthorDate: 2023-10-25 17:03:09 +0000 Commit: Robert Clausecker CommitDate: 2023-10-27 06:35:10 +0000 multimedia/ringrtc: fix build on armv7 Add missing CPU feature detection logic to bundled opus. Approved by: portmgr (build fix blanket) MFH: 2023Q4 (cherry picked from commit 9ce9fc372c730db46ec32d48d63d08a5005ac2ac) --- ...c_webrtc_src_ringrtc_opus_src_celt_arm_armcpu.c | 40 ++++++++++++++++++++++ ...rtc_src_third__party_opus_src_celt_arm_armcpu.c | 40 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_ringrtc_opus_src_celt_arm_armcpu.c b/multimedia/ringrtc/files/patch-src_webrtc_src_ringrtc_opus_src_celt_arm_armcpu.c new file mode 100644 index 000000000000..07d04b8750f2 --- /dev/null +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_ringrtc_opus_src_celt_arm_armcpu.c @@ -0,0 +1,40 @@ +--- ../../src/webrtc/src/ringrtc/opus/src/celt/arm/armcpu.c.orig 2023-10-25 18:24:55 UTC ++++ ../../src/webrtc/src/ringrtc/opus/src/celt/arm/armcpu.c +@@ -148,6 +148,37 @@ + } + return flags; + } ++#elif defined(__FreeBSD__) ++#include ++ ++opus_uint32 opus_cpu_capabilities(void) ++{ ++ long hwcap = 0; ++ opus_uint32 flags = 0; ++ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ ++# if defined(OPUS_ARM_MAY_HAVE_EDSP) || defined(OPUS_ARM_MAY_HAVE_MEDIA) \ ++ || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) ++ if (hwcap & HWCAP_EDSP) ++ flags |= OPUS_CPU_ARM_EDSP_FLAG; ++ ++# if defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) ++ if (hwcap & HWCAP_NEON) ++ flags |= OPUS_CPU_ARM_NEON_FLAG; ++# endif ++# endif ++ ++# if defined(OPUS_ARM_MAY_HAVE_MEDIA) \ ++ || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) ++ ++# if __ARM_ARCH >= 6 ++ flags |= OPUS_CPU_ARM_MEDIA_FLAG; ++# endif ++# endif ++ ++ return (flags); ++} + #else + /* The feature registers which can tell us what the processor supports are + * accessible in priveleged modes only, so we can't have a general user-space diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_opus_src_celt_arm_armcpu.c b/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_opus_src_celt_arm_armcpu.c new file mode 100644 index 000000000000..e5d59c3fc889 --- /dev/null +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_opus_src_celt_arm_armcpu.c @@ -0,0 +1,40 @@ +--- ../../src/webrtc/src/third_party/opus/src/celt/arm/armcpu.c.orig 2023-10-25 18:00:46 UTC ++++ ../../src/webrtc/src/third_party/opus/src/celt/arm/armcpu.c +@@ -148,6 +148,37 @@ + } + return flags; + } ++#elif defined(__FreeBSD__) ++#include ++ ++opus_uint32 opus_cpu_capabilities(void) ++{ ++ long hwcap = 0; ++ opus_uint32 flags = 0; ++ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); ++ ++# if defined(OPUS_ARM_MAY_HAVE_EDSP) || defined(OPUS_ARM_MAY_HAVE_MEDIA) \ ++ || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) ++ if (hwcap & HWCAP_EDSP) ++ flags |= OPUS_CPU_ARM_EDSP_FLAG; ++ ++# if defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) ++ if (hwcap & HWCAP_NEON) ++ flags |= OPUS_CPU_ARM_NEON_FLAG; ++# endif ++# endif ++ ++# if defined(OPUS_ARM_MAY_HAVE_MEDIA) \ ++ || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) ++ ++# if __ARM_ARCH >= 6 ++ flags |= OPUS_CPU_ARM_MEDIA_FLAG; ++# endif ++# endif ++ ++ return (flags); ++} + #else + /* The feature registers which can tell us what the processor supports are + * accessible in priveleged modes only, so we can't have a general user-space