media/libpng/arm.patch

   1 diff --git ../../../libpng-1.6.16/arm/arm_init.c arm/arm_init.c
   2 --- ../../../libpng-1.6.16/arm/arm_init.c       2014-12-21 22:08:08.000000000 -0500
   3 +++ arm/arm_init.c      2014-12-22 17:33:57.556305506 -0500
   4 @@ -29,17 +29,17 @@
   5   * You may set the macro PNG_ARM_NEON_FILE to the file name of file containing
   6   * a fragment of C source code which defines the png_have_neon function.  There
   7   * are a number of implementations in contrib/arm-neon, but the only one that
   8   * has partial support is contrib/arm-neon/linux.c - a generic Linux
   9   * implementation which reads /proc/cpufino.
  10   */
  11  #ifndef PNG_ARM_NEON_FILE
  12  #  ifdef __linux__
  13 -#     define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
  14 +#     define PNG_ARM_NEON_FILE "linux.c"
  15  #  endif
  16  #endif
  17
  18  #ifdef PNG_ARM_NEON_FILE
  19
  20  #include <signal.h> /* for sig_atomic_t */
  21  static int png_have_neon(png_structp png_ptr);
  22  #include PNG_ARM_NEON_FILE
  23 diff --git ../../../libpng-1.6.16/arm/filter_neon.S arm/filter_neon.S
  24 --- ../../../libpng-1.6.16/arm/filter_neon.S    2014-12-21 22:08:08.000000000 -0500
  25 +++ arm/filter_neon.S   2014-12-22 17:43:31.588323649 -0500
  26 @@ -5,16 +5,22 @@
  27   * Written by Mans Rullgard, 2011.
  28   * Last changed in libpng 1.6.16 [December 22, 2014]
  29   *
  30   * This code is released under the libpng license.
  31   * For conditions of distribution and use, see the disclaimer
  32   * and license in png.h
  33   */
  34
  35 +/* These are required because Mozilla's moz.build system doesn't pass
  36 + * -DDefined macros to the assembler.
  37 + */
  38 +#define PNG_READ_SUPPORTED
  39 +#define MOZ_PNG_HAVE_ARM_NEON
  40 +
  41  /* This is required to get the symbol renames, which are #defines, and the
  42   * definitions (or not) of PNG_ARM_NEON_OPT and PNG_ARM_NEON_IMPLEMENTATION.
  43   */
  44  #define PNG_VERSION_INFO_ONLY
  45  #include "../pngpriv.h"
  46
  47  #if defined(__linux__) && defined(__ELF__)
  48  .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */