From: Daniel Golle <redacted>
Date: Sun, 22 Jun 2025 17:15:05 +0000 (+0100)
Subject: libtheora: use CONFIGURE_ARGS, fix build on armeb
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6f9b8675410f071c23410f79fd42d59568ea606e;p=openwrt-packages.git

libtheora: use CONFIGURE_ARGS, fix build on armeb

Use CONFIGURE_ARGS instead of defining a custom Build/Configure target.
Set --disable-asm on armeb to fix build error:
  CC       apiwrapper.lo
In file included from state.h:56,
                 from apiwrapper.h:24,
                 from apiwrapper.c:21:
arm/armint.h:24:5: error: #error "Big-endian configurations are not supported by the ARM asm. " "Reconfigure with --disable-asm or undefine OC_ARM_ASM."
   24 | #   error "Big-endian configurations are not supported by the ARM asm. " \
      |     ^~~~~

Signed-off-by: Daniel Golle <redacted>
---

diff --git a/libs/libtheora/Makefile b/libs/libtheora/Makefile
index 19ed1e8f3..58404b9ef 100644
--- a/libs/libtheora/Makefile
+++ b/libs/libtheora/Makefile
@@ -42,14 +42,15 @@ features supported by the decoder to improve over what is
 is possible with VP3.
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-examples \
-		--disable-oggtest \
-		--disable-vorbistest \
-		--disable-sdltest \
-	)
-endef
+CONFIGURE_ARGS += \
+	--disable-examples \
+	--disable-oggtest \
+	--disable-vorbistest \
+	--disable-sdltest
+
+ifneq ($(findstring armeb,$(CONFIG_ARCH)),)
+CONFIGURE_ARGS += --disable-asm
+endif
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/theora/