oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'opus' of https://github.com/neheb/MPD

This commit is contained in:
Max Kellermann 2024-07-10 09:27:16 +02:00
parent 266deaaef1 2d1feb78b5
commit 00c4abfd2e
2 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subprojects/opus.wrap
View File

@ -1,13 +1,10 @@
[wrap-file]
directory = opus-1.4
source_url = https://downloads.xiph.org/releases/opus/opus-1.4.tar.gz
source_filename = opus-1.4.tar.gz
source_hash = c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/opus_1.4-1/opus-1.4.tar.gz
wrapdb_version = 1.4-1
# fix for https://github.com/xiph/opus/issues/273
diff_files = opus_have_arm_intrinsics_or_asm.patch
directory = opus-1.5.2
source_url = https://downloads.xiph.org/releases/opus/opus-1.5.2.tar.gz
source_filename = opus-1.5.2.tar.gz
source_hash = 65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/opus_1.5.2-1/opus-1.5.2.tar.gz
wrapdb_version = 1.5.2-1
[provide]
opus = opus_dep

33
subprojects/packagefiles/opus_have_arm_intrinsics_or_asm.patch
View File

@ -1,33 +0,0 @@
From 20c032d27c59d65b19b8ffbb2608e5282fe817eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@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 ed66d3807..9f28de333 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)