Skip to content

Commit eadc5bf

Browse files
committed
Work around Opus compilation issues on armhf.
1 parent ad1cd64 commit eadc5bf

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

snap/snapcraft.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,16 @@ parts:
174174
libopus:
175175
source: https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.5.1.tar.gz
176176
source-checksum: sha256/b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85
177-
plugin: autotools
178-
autotools-configure-parameters: [ --prefix=/usr, --enable-float-approx, --enable-osce ]
177+
plugin: make
179178
build-environment:
180179
- CFLAGS: "$CFLAGS -O3 -funroll-loops"
180+
override-build: |
181+
if [ "$SNAP_ARCH" = "armhf" ]; then
182+
./configure --prefix=/usr --enable-float-approx --enable-osce --disable-intrinsics --disable-rtcd
183+
else
184+
./configure --prefix=/usr --enable-float-approx --enable-osce
185+
fi
186+
snapcraftctl build
181187
prime:
182188
- usr/lib/libopus.so*
183189

tools/build-codecs

+2
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,8 @@ for package in ${packages[@]}; do
629629
elif [[ $uname == *MINGW* ]] && [[ $arm64 == true ]]; then
630630
configure_exports="ARM_DOTPROD_INTR_CFLAGS=\"$CFLAGS\""
631631
configure_flags="$configure_flags --disable-rtcd"
632+
elif [[ $arm == true ]]; then
633+
configure_flags="$configure_flags --disable-intrinsics --disable-rtcd"
632634
fi
633635
build $opus_location .libs/libopus$sharedinfix.$sharedext Opus.$sharedext
634636

0 commit comments

Comments
 (0)