Android: fix compilation libpng-1.6.37 (missing arm/palette_neon_intrinsics.c) release-2.0.5
authorSylvain Becker
Thu, 20 Jun 2019 10:20:04 +0200
changeset 6726dd3b4df8ec1
parent 671 9149932d931e
child 673 3dbafbda029f
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
external/libpng-1.6.37/Android.mk
     1.1 --- a/external/libpng-1.6.37.patch	Wed Jun 19 10:24:03 2019 -0700
     1.2 +++ b/external/libpng-1.6.37.patch	Thu Jun 20 10:20:04 2019 +0200
     1.3 @@ -13,15 +13,15 @@
     1.4  +
     1.5  +ifeq ($(TARGET_ARCH_ABI),armeabi)
     1.6  +common_SRC_FILES += \
     1.7 -+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
     1.8 ++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
     1.9  +endif
    1.10  +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
    1.11  +common_SRC_FILES += \
    1.12 -+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
    1.13 ++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
    1.14  +endif
    1.15  +ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
    1.16  +common_SRC_FILES += \
    1.17 -+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
    1.18 ++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
    1.19  +endif
    1.20  +
    1.21  +common_CFLAGS := ## -fomit-frame-pointer
     2.1 --- a/external/libpng-1.6.37/Android.mk	Wed Jun 19 10:24:03 2019 -0700
     2.2 +++ b/external/libpng-1.6.37/Android.mk	Thu Jun 20 10:20:04 2019 +0200
     2.3 @@ -9,15 +9,15 @@
     2.4  
     2.5  ifeq ($(TARGET_ARCH_ABI),armeabi)
     2.6  common_SRC_FILES += \
     2.7 -	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
     2.8 +	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
     2.9  endif
    2.10  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
    2.11  common_SRC_FILES += \
    2.12 -	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
    2.13 +	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
    2.14  endif
    2.15  ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
    2.16  common_SRC_FILES += \
    2.17 -	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
    2.18 +	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
    2.19  endif
    2.20  
    2.21  common_CFLAGS := ## -fomit-frame-pointer