Work around Opus compilation issues on armhf.

enzo1982 · Mar 10, 2024 · eadc5bf · eadc5bf
1 parent ad1cd64
commit eadc5bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -174,10 +174,16 @@ parts:
   libopus:
     source: https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.5.1.tar.gz
     source-checksum: sha256/b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85
-    plugin: autotools
-    autotools-configure-parameters: [ --prefix=/usr, --enable-float-approx, --enable-osce ]
+    plugin: make
     build-environment:
       - CFLAGS: "$CFLAGS -O3 -funroll-loops"
+    override-build: |
+      if [ "$SNAP_ARCH" = "armhf" ]; then
+        ./configure --prefix=/usr --enable-float-approx --enable-osce --disable-intrinsics --disable-rtcd
+      else
+        ./configure --prefix=/usr --enable-float-approx --enable-osce
+      fi
+      snapcraftctl build
     prime:
       - usr/lib/libopus.so*
 

diff --git a/tools/build-codecs b/tools/build-codecs
@@ -629,6 +629,8 @@ for package in ${packages[@]}; do
     elif [[ $uname == *MINGW* ]] && [[ $arm64 == true ]]; then
       configure_exports="ARM_DOTPROD_INTR_CFLAGS=\"$CFLAGS\""
       configure_flags="$configure_flags --disable-rtcd"
+    elif [[ $arm == true ]]; then
+      configure_flags="$configure_flags --disable-intrinsics --disable-rtcd"
     fi
     build $opus_location .libs/libopus$sharedinfix.$sharedext Opus.$sharedext