sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libx265: disable assembly for arm (#7589)

Browse Source
This commit is contained in:
xtkoba 2021-09-26 01:26:57 +09:00 committed by GitHub
parent fc6ae9236a
commit 5af3852007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/libx265/build.sh
View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3.5
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://bitbucket.org/multicoreware/x265_git/downloads/x265_$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
TERMUX_PKG_DEPENDS="libc++"
@ -27,6 +28,8 @@ termux_step_pre_configure() {
elif [ "$TERMUX_ARCH" = arm ]; then
# Follow termux_step_setup_toolchain.sh
ARM_ARGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb"
# Avoid text relocations.
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_ASSEMBLY=OFF"
fi
TERMUX_PKG_SRCDIR="$TERMUX_PKG_SRCDIR/source"

11
packages/libx265/source-common-primitives.cpp.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/source/common/primitives.cpp
+++ b/source/common/primitives.cpp
@@ -295,7 +295,7 @@
void PFX(cpu_cpuid)(uint32_t, uint32_t *eax, uint32_t *, uint32_t *, uint32_t *) { *eax = 0; }
void PFX(cpu_xgetbv)(uint32_t, uint32_t *, uint32_t *) {}
-#if X265_ARCH_ARM == 0
+#if X265_ARCH_ARM == 0 || !ENABLE_ASSEMBLY
void PFX(cpu_neon_test)(void) {}
int PFX(cpu_fast_neon_mrc_test)(void) { return 0; }
#endif // X265_ARCH_ARM