зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1761534: Clean up libpng's moz.yaml r=jewilde
Depends on D142123 Differential Revision: https://phabricator.services.mozilla.com/D142124
This commit is contained in:
Родитель
438f955023
Коммит
3a556a6c17
|
@ -0,0 +1,66 @@
|
|||
diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c
|
||||
--- a/arm/filter_neon_intrinsics.c
|
||||
+++ b/arm/filter_neon_intrinsics.c
|
||||
@@ -13,17 +13,17 @@
|
||||
|
||||
#include "../pngpriv.h"
|
||||
|
||||
#ifdef PNG_READ_SUPPORTED
|
||||
|
||||
/* This code requires -mfpu=neon on the command line: */
|
||||
#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
|
||||
|
||||
-#if defined(_MSC_VER) && defined(_M_ARM64)
|
||||
+#if defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__)
|
||||
# include <arm64_neon.h>
|
||||
#else
|
||||
# include <arm_neon.h>
|
||||
#endif
|
||||
|
||||
/* libpng row pointers are not necessarily aligned to any particular boundary,
|
||||
* however this code will only work with appropriate alignment. arm/arm_init.c
|
||||
* checks for this (and will not compile unless it is done). This code uses
|
||||
diff --git a/media/libpng/arm/palette_neon_intrinsics.c b/media/libpng/arm/palette_neon_intrinsics.c
|
||||
--- a/arm/palette_neon_intrinsics.c
|
||||
+++ b/arm/palette_neon_intrinsics.c
|
||||
@@ -9,17 +9,17 @@
|
||||
* For conditions of distribution and use, see the disclaimer
|
||||
* and license in png.h
|
||||
*/
|
||||
|
||||
#include "../pngpriv.h"
|
||||
|
||||
#if PNG_ARM_NEON_IMPLEMENTATION == 1
|
||||
|
||||
-#if defined(_MSC_VER) && defined(_M_ARM64)
|
||||
+#if defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__)
|
||||
# include <arm64_neon.h>
|
||||
#else
|
||||
# include <arm_neon.h>
|
||||
#endif
|
||||
|
||||
/* Build an RGBA8 palette from the separate RGB and alpha palettes. */
|
||||
void
|
||||
png_riffle_palette_neon(png_structrp png_ptr)
|
||||
diff --git a/media/libpng/pngrtran.c b/media/libpng/pngrtran.c
|
||||
--- a/pngrtran.c
|
||||
+++ b/pngrtran.c
|
||||
@@ -16,17 +16,17 @@
|
||||
* in pngtrans.c.
|
||||
*/
|
||||
|
||||
#include "pngpriv.h"
|
||||
|
||||
#ifdef PNG_ARM_NEON_IMPLEMENTATION
|
||||
# if PNG_ARM_NEON_IMPLEMENTATION == 1
|
||||
# define PNG_ARM_NEON_INTRINSICS_AVAILABLE
|
||||
-# if defined(_MSC_VER) && defined(_M_ARM64)
|
||||
+# if defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__)
|
||||
# include <arm64_neon.h>
|
||||
# else
|
||||
# include <arm_neon.h>
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef PNG_READ_SUPPORTED
|
|
@ -11,7 +11,7 @@ origin:
|
|||
url: "http://www.libpng.org/pub/png/libpng.html"
|
||||
license: libpng
|
||||
|
||||
release: commit a40189cf881e9f0db80511c382292a5604c3c3d1 (2019-04-14T10:10:32:00Z).
|
||||
release: commit v1.6.37 (2019-04-14T14:10:32-04:00).
|
||||
|
||||
revision: "v1.6.37"
|
||||
|
||||
|
@ -46,12 +46,32 @@ vendoring:
|
|||
- LICENSE
|
||||
- README
|
||||
- TRADEMARK
|
||||
- "*.c"
|
||||
- "*.h"
|
||||
- png.c
|
||||
- pngconf.h
|
||||
- pngdebug.h
|
||||
- pngerror.c
|
||||
- pngget.c
|
||||
- png.h
|
||||
- pnginfo.h
|
||||
- pngmem.c
|
||||
- pngpread.c
|
||||
- pngpriv.h
|
||||
- pngread.c
|
||||
- pngrio.c
|
||||
- pngrtran.c
|
||||
- pngrutil.c
|
||||
- pngset.c
|
||||
- pngstruct.h
|
||||
- pngtrans.c
|
||||
- pngwio.c
|
||||
- pngwrite.c
|
||||
- pngwtran.c
|
||||
- pngwutil.c
|
||||
|
||||
keep:
|
||||
- MOZCHANGES
|
||||
- crashtests
|
||||
- pnglibconf.h
|
||||
|
||||
update-actions:
|
||||
- action: copy-file
|
||||
|
|
Загрузка…
Ссылка в новой задаче