From 053dc98d50dcec0e8ca55510510d1378dcec9b74 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 19 Sep 2022 10:19:49 +0000
Subject: [PATCH 1/2] kodi: do not set ENABLE_NEON for target x86_64

If ENABLE_NEON is set whilst building x86_64 with cmake. cmake warnings
that the variable is not been used.
---
 packages/mediacenter/kodi/package.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 99be4888e8..607f292f58 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -173,10 +173,14 @@ configure_package() {
     KODI_UPNP="-DENABLE_UPNP=OFF"
   fi
 
-  if target_has_feature neon; then
-    KODI_NEON="-DENABLE_NEON=ON"
+  if [ "${TARGET_ARCH}" = "aarch64" -o "${TARGET_ARCH}" = "arm" ]; then
+    if target_has_feature neon; then
+      KODI_NEON="-DENABLE_NEON=ON"
+    else
+      KODI_NEON="-DENABLE_NEON=OFF"
+    fi
   else
-    KODI_NEON="-DENABLE_NEON=OFF"
+    KODI_NEON=""
   fi
 
   if [ "${VDPAU_SUPPORT}" = "yes" -a "${DISPLAYSERVER}" = "x11" ]; then

From 296735fe3e73302c787cf09f21751e829989c23f Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 22 Sep 2022 01:40:29 +0000
Subject: [PATCH 2/2] aom: update to 3.5.0 and do not set ENABLE_NEON for
 target x86_64

---
 packages/multimedia/aom/package.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk
index 6403e32a60..8ed71d85d9 100644
--- a/packages/multimedia/aom/package.mk
+++ b/packages/multimedia/aom/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aom"
-PKG_VERSION="3.4.0"
-PKG_SHA256="bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354"
+PKG_VERSION="3.5.0"
+PKG_SHA256="d37dbee372e2430a7efde813984ae6d78bdf1fc4080ebe32457c9115408b0738"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"
 PKG_URL="https://storage.googleapis.com/aom-releases/libaom-${PKG_VERSION}.tar.gz"
@@ -19,8 +19,6 @@ PKG_CMAKE_OPTS_TARGET="-DENABLE_CCACHE=1 \
 
 if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" nasm:host"
-fi
-
-if ! target_has_feature neon; then
+elif ! target_has_feature neon; then
   PKG_CMAKE_OPTS_TARGET+=" -DENABLE_NEON=0 -DENABLE_NEON_ASM=0"
 fi