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 @@ -34,9 +34,9 @@
   5   * implementation which reads /proc/cpufino.
   6   */
   7  #ifndef PNG_ARM_NEON_FILE
   8  #  ifdef __linux__
   9 -#     define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
  10 +#     define PNG_ARM_NEON_FILE "linux.c"
  11  #  endif
  12  #endif
  13
  14  #ifdef PNG_ARM_NEON_FILE
  15 diff --git a/arm/filter_neon.S b/arm/filter_neon.S
  16 --- a/arm/filter_neon.S
  17 +++ b/arm/filter_neon.S
  18 @@ -9,8 +9,14 @@
  19   * For conditions of distribution and use, see the disclaimer
  20   * and license in png.h
  21   */
  22
  23 +/* These are required because Mozilla's moz.build system doesn't pass
  24 + * -DDefined macros to the assembler.
  25 + */
  26 +#define PNG_READ_SUPPORTED
  27 +#define MOZ_PNG_HAVE_ARM_NEON
  28 +
  29  /* This is required to get the symbol renames, which are #defines, and the
  30   * definitions (or not) of PNG_ARM_NEON_OPT and PNG_ARM_NEON_IMPLEMENTATION.
  31   */
  32  #define PNG_VERSION_INFO_ONLY