Effectively reverts parts of
249544ffd ("libpng: version bump 1.6.29 -> 1.6.34")."--enable-arm-neon=check" leads to problems on ARM64, such as: arm/arm_init.c:39:6: error: #error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this platform" The check mechanism is not recommended anyway [1]: WARNING: it is strongly recommended that you do not build libpng with run-time checks for CPU features if at all possible. In the case of the ARM NEON instructions there is no processor-specific way of detecting the presence of the required support, therefore run-time detection is extremely OS specific. So stick to yes/no for the ARM NEON option by switching to the ptx/yesno macro. [1] https://sourceforge.net/p/libpng/code/ci/v1.6.38/tree/arm/arm_init.c#l21 Signed-off-by: Bastian Krause <[email protected]> --- Changes since (implicit) v1: - adjust --enable-arm-neon option --- rules/libpng.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/libpng.make b/rules/libpng.make index 0a1fbdee9..aff687df6 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.6.37 -LIBPNG_MD5 := 015e8e15db1eecde5f2eb9eb5b6e59e9 +LIBPNG_VERSION := 1.6.38 +LIBPNG_MD5 := 122e6b7837811698563083b352bc8ca2 LIBPNG := libpng-$(LIBPNG_VERSION) LIBPNG_SUFFIX := tar.xz LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX)) @@ -37,7 +37,7 @@ LIBPNG_CONF_OPT := \ --enable-unversioned-links \ --enable-unversioned-libpng-pc \ --enable-unversioned-libpng-config \ - --enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, check, no) \ + --enable-arm-neon=$(call ptx/yesno, PTXCONF_ARCH_ARM_NEON) \ --disable-mips-msa \ --$(call ptx/endis, PTXCONF_ARCH_X86)-intel-sse \ --disable-powerpc-vsx \ -- 2.30.2
