Tristan Matthews pushed to branch master at VideoLAN / VLC
Commits:
d0608821 by Tristan Matthews at 2024-03-07T00:03:24-05:00
contrib: opus: update to 1.5.1
See:
https://opus-codec.org/demo/opus-1.5/
- - - - -
4 changed files:
- +
contrib/src/opus/0001-dnn-vec_neon-avoid-redefinition-of-vcvtnq_s32_f32.patch
- − contrib/src/opus/0001-meson-arm64.patch
- contrib/src/opus/SHA512SUMS
- contrib/src/opus/rules.mak
Changes:
=====================================
contrib/src/opus/0001-dnn-vec_neon-avoid-redefinition-of-vcvtnq_s32_f32.patch
=====================================
@@ -0,0 +1,29 @@
+From 2311fb266a9791901d0829f80060e6ecde35861a Mon Sep 17 00:00:00 2001
+From: Martin Storsjo <mar...@martin.st>
+Date: Tue, 5 Mar 2024 09:11:30 -0500
+Subject: [PATCH 1/1] dnn: vec_neon: avoid redefinition of vcvtnq_s32_f32
+
+clang exposes this intrinsic even in 32-bit mode, if targeting >= armv8,
+whereas gcc does not, see:
+
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95399
+---
+ dnn/vec_neon.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dnn/vec_neon.h b/dnn/vec_neon.h
+index acf49f47..e6432e2f 100644
+--- a/dnn/vec_neon.h
++++ b/dnn/vec_neon.h
+@@ -34,7 +34,7 @@
+ #include <arm_neon.h>
+ #include "os_support.h"
+
+-#if defined(__arm__) && !defined(__aarch64__)
++#if defined(__arm__) && !defined(__aarch64__) && (__ARM_ARCH < 8 ||
!defined(__clang__))
+ /* 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);
+--
+2.40.1
+
=====================================
contrib/src/opus/0001-meson-arm64.patch deleted
=====================================
@@ -1,36 +0,0 @@
-From 07d1fa08b618585c7c019b7a24a221c8161cbbb5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <t...@centricular.com>
-Date: Thu, 20 Apr 2023 19:06:13 +0100
-Subject: [PATCH] meson: fix build on arm64
-
-Would fail like:
-
-Checking if "compiler supports ARMv7/AArch64 NEON intrinsics" : links: NO
-Checking if "compiler supports ARMv7/AArch64 NEON intrinsics with -mfpu=neon"
: links: YES
-Checking if "compiler supports AArch64 NEON intrinsics" : links: NO
-Checking if "compiler supports AArch64 NEON intrinsics with -mfpu=neon" :
links: NO
-Message: Compiler does not support AArch64 NEON intrinsics
-../silk/meson.build:28:45: ERROR: Unknown variable
"have_arm_intrinsics_or_asm".
-
-since commit 08088411259056f63774befb2d00951fdd5c46ba.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index ed66d380..9f28de33 100644
---- a/meson.build
-+++ b/meson.build
-@@ -574,8 +574,8 @@ foreach l : lines
- endforeach
-
- subdir('include')
--subdir('silk')
- subdir('celt')
-+subdir('silk')
- subdir('src')
-
- configure_file(output: 'config.h', configuration: opus_conf)
---
-GitLab
-
=====================================
contrib/src/opus/SHA512SUMS
=====================================
@@ -1 +1 @@
-1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631
opus-1.4.tar.gz
+fa66c5d753f5deb5d61d068ff8f633d8cb5f454c94aeee9c404023ebc483f9b350586cdd98b7013faf4df3193e170a1708aaa598914275f7bc8be07587cc4dc6
opus-1.5.1.tar.gz
=====================================
contrib/src/opus/rules.mak
=====================================
@@ -1,6 +1,6 @@
# opus
-OPUS_VERSION := 1.4
+OPUS_VERSION := 1.5.1
OPUS_URL := $(XIPH)/opus/opus-$(OPUS_VERSION).tar.gz
@@ -16,7 +16,7 @@ $(TARBALLS)/opus-$(OPUS_VERSION).tar.gz:
opus: opus-$(OPUS_VERSION).tar.gz .sum-opus
$(UNPACK)
- $(APPLY) $(SRC)/opus/0001-meson-arm64.patch
+ $(APPLY)
$(SRC)/opus/0001-dnn-vec_neon-avoid-redefinition-of-vcvtnq_s32_f32.patch
$(MOVE)
OPUS_CONF= -D extra-programs=disabled -D tests=disabled -D docs=disabled
@@ -24,6 +24,13 @@ ifndef HAVE_FPU
OPUS_CONF += -D fixed-point=true
endif
+# disable rtcd on win64-arm-llvm
+ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
+ifdef HAVE_CLANG
+OPUS_CONF += -D rtcd=disabled
+endif
+endif
+
.opus: opus crossfile.meson
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) $(OPUS_CONF)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/d060882171620c4cd80a6029aefcc8bcc0e6e3d0
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/d060882171620c4cd80a6029aefcc8bcc0e6e3d0
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
