From: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:00:25 +0000 (+0000)
Subject: Match multiple ARM architecture name variants in Makefile.ffmpeg
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1988%2Fhead;p=thirdparty%2Ftvheadend.git

Match multiple ARM architecture name variants in Makefile.ffmpeg

Co-authored-by: Flole998 <9951871+Flole998@users.noreply.github.com>
---

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index dadd0076c..d3d8fd51d 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -24,13 +24,15 @@ FFMPEG_HOST   := $(ARCH)-linux-gnu
 FFMPEG_TARGET := x86-linux-gcc
 endif
 
-ifeq ($(ARCH),armhf)
+# Match various ARM 32-bit architecture names
+ifneq (,$(filter armhf armv7 armv7l arm,$(ARCH)))
 FFMPEG_HOST   := arm-linux-gnueabihf
 FFMPEG_ARCH   := armv7
 FFMPEG_CPU    := armv7-a
 endif
 
-ifeq ($(ARCH),arm64)
+# Match various ARM 64-bit architecture names
+ifneq (,$(filter arm64 aarch64,$(ARCH)))
 FFMPEG_HOST   := aarch64-linux-gnu
 FFMPEG_ARCH   := aarch64
 FFMPEG_CPU    := armv8-a