Thanks, applied as dcd1bd2f752aa4213087020eb0f2816d49f45d8d.
Michael
[sent from post-receive hook]
On Wed, 19 Oct 2022 07:41:20 +0200, Bastian Krause <b...@pengutronix.de> wrote:
> 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 <b...@pengutronix.de>
> Message-Id: <20221005102705.2346939-1-...@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
>
> diff --git a/rules/libpng.make b/rules/libpng.make
> index e9b0bf67a942..aff687df640f 100644
> --- a/rules/libpng.make
> +++ b/rules/libpng.make
> @@ -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 \
