Skip to content

Commit e7eac3a

Browse files
carstene1nscarstene1ns
committed
Use CMake for opus
3DS/Wii: use fixed point decoding opusfile will support cmake with the next release (added in 2022)
1 parent de57426 commit e7eac3a

File tree

13 files changed

+17
-22
lines changed

13 files changed

+17
-22
lines changed

‎3ds/2_build_toolchain.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@ install_lib $MPG123_DIR $MPG123_ARGS
106106
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
107107
install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
108108
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
109-
install_lib $OPUS_DIR $OPUS_ARGS --disable-asm
110-
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
109+
# asm support is missing in opus cmake, but might be added one day,
110+
# likely -DOPUS_ASM=OFF then, beware if switching to meson
111+
install_lib_cmake $OPUS_DIR $OPUS_ARGS -DOPUS_FIXED_POINT=ON
112+
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS --enable-fixed-point
111113
install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS
112114
install_lib_meson $INIH_DIR $INIH_ARGS
113115
install_lib $LHASA_DIR $LHASA_ARGS

‎android/2_build_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function build() {
113113
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
114114
install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
115115
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
116-
install_lib $OPUS_DIR $OPUS_ARGS
116+
install_lib_cmake $OPUS_DIR $OPUS_ARGS
117117
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
118118
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
119119
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS

‎emscripten/2_build_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ install_lib $LIBSNDFILE_DIR $LIBSNDFILE_ARGS
109109
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
110110
install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
111111
#install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
112-
install_lib $OPUS_DIR $OPUS_ARGS --disable-stack-protector
112+
install_lib_cmake $OPUS_DIR $OPUS_ARGS -DOPUS_STACK_PROTECTOR=OFF
113113
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
114114
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
115115
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS

‎ios/2_build_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function build() {
7474
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
7575
install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
7676
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
77-
install_lib $OPUS_DIR $OPUS_ARGS
77+
install_lib_cmake $OPUS_DIR $OPUS_ARGS
7878
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
7979
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -DCMAKE_MACOSX_BUNDLE=OFF
8080
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS

‎linux-static/2_build_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ install_lib $LIBSNDFILE_DIR $LIBSNDFILE_ARGS
5757
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
5858
install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
5959
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
60-
install_lib $OPUS_DIR $OPUS_ARGS
60+
install_lib_cmake $OPUS_DIR $OPUS_ARGS
6161
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
6262
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
6363
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS

‎macos/2_build_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function build() {
7474
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
7575
install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
7676
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
77-
install_lib $OPUS_DIR $OPUS_ARGS
77+
install_lib_cmake $OPUS_DIR $OPUS_ARGS
7878
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
7979
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
8080
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS

‎shared/packages.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ anitya_id = 9179
9898
[opus]
9999
version = 1.5.2
100100
url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"
101-
arguments = "--disable-intrinsics --disable-extra-programs"
101+
arguments = "-DOPUS_DISABLE_INTRINSICS=ON"
102102
anitya_id = 11081
103103

104104
[opusfile]

‎shared/packages.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ WILDMIDI_DIR="wildmidi-wildmidi-0.4.6"
6666
WILDMIDI_ARGS="-DWANT_PLAYER=OFF -DWANT_STATIC=ON"
6767

6868
OPUS_URL="https://downloads.xiph.org/releases/opus/opus-1.5.2.tar.gz"
69-
OPUS_ARGS="--disable-intrinsics --disable-extra-programs"
69+
OPUS_ARGS="-DOPUS_DISABLE_INTRINSICS=ON"
7070
OPUS_DIR="opus-1.5.2"
7171

7272
OPUSFILE_URL="https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"

‎switch/2_build_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ install_lib $MPG123_DIR $MPG123_ARGS
8989
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
9090
install_lib_cmake $LIBSAMPLERATE_DIR $LIBSAMPLERATE_ARGS
9191
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
92-
install_lib $OPUS_DIR $OPUS_ARGS
92+
install_lib_cmake $OPUS_DIR $OPUS_ARGS
9393
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
9494
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
9595
install_lib_meson $INIH_DIR $INIH_ARGS

‎tvos/2_build_toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function build() {
7474
install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS
7575
install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS
7676
install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS
77-
install_lib $OPUS_DIR $OPUS_ARGS
77+
install_lib_cmake $OPUS_DIR $OPUS_ARGS
7878
install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
7979
install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS -DCMAKE_MACOSX_BUNDLE=OFF
8080
install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS

0 commit comments

Comments
 (0)