From ab2a9c602623193d61827ccd395302d92d90fc38 Mon Sep 17 00:00:00 2001 From: Sylvain Becker Date: Thu, 20 Jun 2019 10:20:04 +0200 Subject: [PATCH] Android: fix compilation libpng-1.6.37 (missing arm/palette_neon_intrinsics.c) undefined reference to `png_riffle_palette_neon' undefined reference to `png_do_expand_palette_rgba8_neon' undefined reference to `png_do_expand_palette_rgb8_neon' --- external/libpng-1.6.37.patch | 6 +++--- external/libpng-1.6.37/Android.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/external/libpng-1.6.37.patch b/external/libpng-1.6.37.patch index 8940b2e5..4903871b 100644 --- a/external/libpng-1.6.37.patch +++ b/external/libpng-1.6.37.patch @@ -13,15 +13,15 @@ diff -ruN libpng-1.6.37.orig/Android.mk libpng-1.6.37/Android.mk + +ifeq ($(TARGET_ARCH_ABI),armeabi) +common_SRC_FILES += \ -+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c ++ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c +endif +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +common_SRC_FILES += \ -+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c ++ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c +endif +ifeq ($(TARGET_ARCH_ABI),arm64-v8a) +common_SRC_FILES += \ -+ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c ++ arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c +endif + +common_CFLAGS := ## -fomit-frame-pointer diff --git a/external/libpng-1.6.37/Android.mk b/external/libpng-1.6.37/Android.mk index 0244f729..62263bed 100644 --- a/external/libpng-1.6.37/Android.mk +++ b/external/libpng-1.6.37/Android.mk @@ -9,15 +9,15 @@ common_SRC_FILES := \ ifeq ($(TARGET_ARCH_ABI),armeabi) common_SRC_FILES += \ - arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c + arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c endif ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) common_SRC_FILES += \ - arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c + arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) common_SRC_FILES += \ - arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c + arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c endif common_CFLAGS := ## -fomit-frame-pointer