Merge pull request #6923 from heitbaum/neon

Do not set ENABLE_NEON_ for not target aarch64 and arm
This commit is contained in:
Jernej Škrabec 2022-10-03 20:05:17 +02:00 committed by GitHub
commit 68a8b6e546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions

View File

@ -173,10 +173,14 @@ configure_package() {
KODI_UPNP="-DENABLE_UPNP=OFF" KODI_UPNP="-DENABLE_UPNP=OFF"
fi fi
if target_has_feature neon; then if [ "${TARGET_ARCH}" = "aarch64" -o "${TARGET_ARCH}" = "arm" ]; then
KODI_NEON="-DENABLE_NEON=ON" if target_has_feature neon; then
KODI_NEON="-DENABLE_NEON=ON"
else
KODI_NEON="-DENABLE_NEON=OFF"
fi
else else
KODI_NEON="-DENABLE_NEON=OFF" KODI_NEON=""
fi fi
if [ "${VDPAU_SUPPORT}" = "yes" -a "${DISPLAYSERVER}" = "x11" ]; then if [ "${VDPAU_SUPPORT}" = "yes" -a "${DISPLAYSERVER}" = "x11" ]; then

View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="aom" PKG_NAME="aom"
PKG_VERSION="3.4.0" PKG_VERSION="3.5.0"
PKG_SHA256="bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354" PKG_SHA256="d37dbee372e2430a7efde813984ae6d78bdf1fc4080ebe32457c9115408b0738"
PKG_LICENSE="BSD" PKG_LICENSE="BSD"
PKG_SITE="https://www.webmproject.org" PKG_SITE="https://www.webmproject.org"
PKG_URL="https://storage.googleapis.com/aom-releases/libaom-${PKG_VERSION}.tar.gz" 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 if [ "${TARGET_ARCH}" = "x86_64" ]; then
PKG_DEPENDS_TARGET+=" nasm:host" PKG_DEPENDS_TARGET+=" nasm:host"
fi elif ! target_has_feature neon; then
if ! target_has_feature neon; then
PKG_CMAKE_OPTS_TARGET+=" -DENABLE_NEON=0 -DENABLE_NEON_ASM=0" PKG_CMAKE_OPTS_TARGET+=" -DENABLE_NEON=0 -DENABLE_NEON_ASM=0"
fi fi