From c6e4ee72df00092cd44811d66c11afad3b1651f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 17 Jan 2024 15:01:24 +0100 Subject: [PATCH] Linux: Disable webm module on arm32, we can't build libvpx properly libvpx arm32 build with NEON can be supported in theory (and it works on Android armv7), but our SCons logic for it is super convoluted and broken. It needs significant rework to be made less error prone, and ensure we can compile `.s` files properly with cross-compilation toolchains. The demand to play WebM videos on older Pi3-style SoCs is likely low, so for now this is a simple compromise. Could be improved with some effort if someone is motivated. --- modules/webm/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/webm/config.py b/modules/webm/config.py index 0bedfa07ef8..1f2f402f3a0 100644 --- a/modules/webm/config.py +++ b/modules/webm/config.py @@ -1,7 +1,13 @@ def can_build(env, platform): if env["arch"].startswith("rv"): return False - return platform not in ["iphone"] + if platform == "iphone": + return False + # Can work in theory but our libvpx/SCsub is too broken to compile NEON .s + # files properly on Linux arm32. Could be fixed by someone motivated. + if platform in ["x11", "server"] and env["arch"] in ["arm", "arm32"]: + return False + return True def configure(env):