Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions recipes/opus/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ sources:
url: "https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz"
sha256: "65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1"
patches:
"1.6.1":
- patch_file: "patches/1.6.1-windows-arm.patch"
"1.5.2":
- patch_file: "patches/1.5.2-add-sse4.1-flag-when-using-clang-cl.patch"
19 changes: 19 additions & 0 deletions recipes/opus/all/patches/1.6.1-windows-arm.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Upstream PR: https://github.com/xiph/opus/pull/471
- Only add the ARM DNN runtime-dispatch source when DNN sources are enabled.
- Match the x86 CMake path and Autotools gating so non-DNN ARM builds do not compile arm_dnn_map.c.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa7b1ae17..913768856 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -563,7 +563,9 @@ if(NOT OPUS_DISABLE_INTRINSICS)
target_compile_definitions(opus PRIVATE OPUS_HAVE_RTCD)
add_sources_group(opus celt ${celt_sources_arm_rtcd})
add_sources_group(opus silk ${silk_sources_arm_rtcd})
- add_sources_group(opus lpcnet ${dnn_sources_arm_rtcd})
+ if (OPUS_DNN)
+ add_sources_group(opus lpcnet ${dnn_sources_arm_rtcd})
+ endif()
else()
message(ERROR "Runtime cpu capability detection needed for MAY_HAVE_NEON")
endif()