From nobody Tue Apr 16 15:23:25 2024 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 4VJnqd6Wmbz5H2hj; Tue, 16 Apr 2024 15:23:25 +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 4VJnqd5sl7z4NtK; Tue, 16 Apr 2024 15:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713281005; 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=ehOXJ5yutxRaHacpChtt0/zIh+QF9gcKt60FXUflHAY=; b=LBymK2h01mMql6BJy32x5MyJa7J50Cs7fTBY1eqDleV7wALVKPq3s8sr7ltKRD4XFcfopC Y4ES3FPWcZZMQJwHQBxqm7l7U9sJzssfi0zqu+Q9E2gcgOCV733FmWXMbLWt5WPz/mjEsQ 9zMD5UCUkuzYidOTdIqpy/pQeugMH96cxeS0YtOtnrtdgwYhIviKME4fei9Q0/L8G+kKLu RtUh3z03WuJ2ZIZu51/s3oUQx3wEGEM3JjSioyWpskh3a41ozNa9kAVpqIKOQIpPUpImzx 27l04yZ431YD+8rGeBd7k1TEqdUbtHB7KoWWwE40q+tWwpnPf2hd4XwcbCH3Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713281005; a=rsa-sha256; cv=none; b=s36/atyWHLKRkV3Gfs9Xd/HF7GSjSFVOPhiyjhWZm/xCdqkmuOe/2HHCvsx4P+h6D7b1La 8rUtwY/4qFerprU+fjqQ+KLZPN/CFwn3wnDOzQaoVf+oKtIlTuWpQGGXQG9KAbMUeMmb5J W5DyRs76l70uXBI8ZeQQxgaeQJkewPQMjTipWqClVVgU0nHcY/kBQYOYgr4M/GML/ePV8G IPEw75Y+SCPnvUFZ9lhPOHxRhf84/ebiZDdiYaYw4ngUp5lUAQxQzmtQpcO3XHX+abDi3N saODAYOqLf75d2pfGY6w24yK3r5s46lRNur0wKtbKoMBf6YOyP/UDzEoZWZp/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713281005; 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=ehOXJ5yutxRaHacpChtt0/zIh+QF9gcKt60FXUflHAY=; b=ejEjIUSsxddHU+3DQzNlmfjNJUsnfHshWcQK/GF9NNvxu0dMDxR7iInTm6GTM+Q9BuIJnY 09pWEOrmQU7TTgdhF0WYfcfpySO0EmxQCEbvOEziarYVQ75z/JaYRKyx+riFTPdB4bjL9N 4ry2+fvoTb8uwURPjr/5dB4By7C2OCQpqA3Jdou2288/g0ynCJclCYJvouxnQ0aEEuX28+ jTz5zV6qOgQpSrP5S1AAOFYDYWiaNnfChn9OHlDUKIgnz6Zb4o/ZMUHt4Eh1D6exvuCbLK PJQGU2HYn3ejdsxzDz4ZueVUiE5f7c1TVgeSkFfySr0xFfAvrmhCgWQpG8okiQ== 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 4VJnqd5TVyzp9k; Tue, 16 Apr 2024 15:23:25 +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 43GFNPrV043555; Tue, 16 Apr 2024 15:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GFNPwd043552; Tue, 16 Apr 2024 15:23:25 GMT (envelope-from git) Date: Tue, 16 Apr 2024 15:23:25 GMT Message-Id: <202404161523.43GFNPwd043552@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: 316c9baba6c4 - main - audio/opus: update to 1.5.2 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: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 316c9baba6c4e627427baf78f7e54fe302a6b7c1 Auto-Submitted: auto-generated The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=316c9baba6c4e627427baf78f7e54fe302a6b7c1 commit 316c9baba6c4e627427baf78f7e54fe302a6b7c1 Author: Christian Weisgerber AuthorDate: 2024-04-16 15:21:04 +0000 Commit: Christian Weisgerber CommitDate: 2024-04-16 15:23:14 +0000 audio/opus: update to 1.5.2 No notable changes. Our local ARM patches have been intregrated upstream. --- audio/opus/Makefile | 2 +- audio/opus/distinfo | 6 ++-- audio/opus/files/patch-celt_arm_armcpu.c | 57 -------------------------------- audio/opus/files/patch-dnn_vec__neon.h | 11 ------ audio/opus/pkg-plist | 2 +- 5 files changed, 5 insertions(+), 73 deletions(-) diff --git a/audio/opus/Makefile b/audio/opus/Makefile index 9c564b45660f..c1824c7b8823 100644 --- a/audio/opus/Makefile +++ b/audio/opus/Makefile @@ -1,5 +1,5 @@ PORTNAME= opus -DISTVERSION= 1.5.1 +DISTVERSION= 1.5.2 CATEGORIES= audio MASTER_SITES= https://downloads.xiph.org/releases/opus/ diff --git a/audio/opus/distinfo b/audio/opus/distinfo index 03b8b35f6d4f..0419403a53e3 100644 --- a/audio/opus/distinfo +++ b/audio/opus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710082536 -SHA256 (opus-1.5.1.tar.gz) = b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85 -SIZE (opus-1.5.1.tar.gz) = 7834540 +TIMESTAMP = 1713280233 +SHA256 (opus-1.5.2.tar.gz) = 65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1 +SIZE (opus-1.5.2.tar.gz) = 7839412 diff --git a/audio/opus/files/patch-celt_arm_armcpu.c b/audio/opus/files/patch-celt_arm_armcpu.c deleted file mode 100644 index 479c34e83b0d..000000000000 --- a/audio/opus/files/patch-celt_arm_armcpu.c +++ /dev/null @@ -1,57 +0,0 @@ ---- celt/arm/armcpu.c.orig 2024-03-01 07:55:09 UTC -+++ celt/arm/armcpu.c -@@ -191,6 +191,54 @@ opus_uint32 opus_cpu_capabilities(void) - return flags; - } - -+#elif defined(__FreeBSD__) -+#include -+ -+opus_uint32 opus_cpu_capabilities(void) -+{ -+ long hwcap = 0; -+ opus_uint32 flags = 0; -+ -+# if defined(OPUS_ARM_MAY_HAVE_MEDIA) \ -+ || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) -+ /* FreeBSD required armv6+, always supported media instructions */ -+ flags |= OPUS_CPU_ARM_MEDIA_FLAG; -+# endif -+ -+ 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) -+# ifdef HWCAP_EDSP -+ if (hwcap & HWCAP_EDSP) -+ flags |= OPUS_CPU_ARM_EDSP_FLAG; -+# endif -+ -+# if defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) -+# ifdef HWCAP_NEON -+ if (hwcap & HWCAP_NEON) -+ flags |= OPUS_CPU_ARM_NEON_FLAG; -+# elif defined(HWCAP_ASIMD) -+ if (hwcap & HWCAP_ASIMD) -+ flags |= OPUS_CPU_ARM_NEON_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_EDSP_FLAG; -+# endif -+# endif -+# if defined(OPUS_ARM_MAY_HAVE_DOTPROD) && defined(HWCAP_ASIMDDP) -+ if (hwcap & HWCAP_ASIMDDP) -+ flags |= OPUS_CPU_ARM_DOTPROD_FLAG; -+# endif -+# endif -+ -+#if defined(OPUS_ARM_PRESUME_AARCH64_NEON_INTR) -+ flags |= OPUS_CPU_ARM_EDSP_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_NEON_FLAG; -+# if defined(OPUS_ARM_PRESUME_DOTPROD) -+ flags |= OPUS_CPU_ARM_DOTPROD_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/audio/opus/files/patch-dnn_vec__neon.h b/audio/opus/files/patch-dnn_vec__neon.h deleted file mode 100644 index 645f72579741..000000000000 --- a/audio/opus/files/patch-dnn_vec__neon.h +++ /dev/null @@ -1,11 +0,0 @@ ---- dnn/vec_neon.h.orig 2024-03-12 15:41:06 UTC -+++ dnn/vec_neon.h -@@ -34,7 +34,7 @@ - #include - #include "os_support.h" - --#if defined(__arm__) && !defined(__aarch64__) -+#if __ARM_ARCH < 8 - /* Emulate vcvtnq_s32_f32() for ARMv7 Neon. */ - static OPUS_INLINE int32x4_t vcvtnq_s32_f32(float32x4_t x) { - return vrshrq_n_s32(vcvtq_n_s32_f32(x, 8), 8); diff --git a/audio/opus/pkg-plist b/audio/opus/pkg-plist index 365844de3aa7..7158f207bd58 100644 --- a/audio/opus/pkg-plist +++ b/audio/opus/pkg-plist @@ -7,6 +7,6 @@ include/opus/opus_types.h lib/libopus.a lib/libopus.so lib/libopus.so.0 -lib/libopus.so.0.10.0 +lib/libopus.so.0.10.1 libdata/pkgconfig/opus.pc share/aclocal/opus.m4