media/libpng/arm.patch

   1 diff --git a/arm/arm_init.c b/arm/arm_init.c
   2 --- a/arm/arm_init.c
   3 +++ b/arm/arm_init.c
   4 @@ -41,7 +41,7 @@
   5       /* ARM Neon is expected to be available on the target CPU architecture. */
   6  #    error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this CPU arch"
   7  #  elif defined(__linux__)
   8 -#    define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
   9 +#    define PNG_ARM_NEON_FILE "linux.c"
  10  #  else
  11  #    error "No support for run-time ARM Neon checking; use compile-time options"
  12  #  endif
  13 diff --git a/arm/filter_neon.S b/arm/filter_neon.S
  14 --- a/arm/filter_neon.S
  15 +++ b/arm/filter_neon.S
  16 @@ -10,6 +10,12 @@
  17   * and license in png.h
  18   */
  19
  20 +/* These are required because Mozilla's moz.build system doesn't pass
  21 + * -DDefined macros to the assembler.
  22 + */
  23 +#define PNG_READ_SUPPORTED
  24 +#define MOZ_PNG_HAVE_ARM_NEON
  25 +
  26  /* This is required to get the symbol renames, which are #defines, and the
  27   * definitions (or not) of PNG_ARM_NEON_OPT and PNG_ARM_NEON_IMPLEMENTATION.
  28   */