AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

roll libpng to pre-1.6.38

Browse Source 
This rolls in the patch to fix NEON + clang-cl.

Cq-Include-Trybots: skia.primary:Build-Win-Clang-arm64-Release
Change-Id: Id34730763ff56b89bb49033001ffb42b09d55a61
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/210360
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
This commit is contained in:
Mike Klein 2019-04-25 08:20:02 -05:00 committed by Skia Commit-Bot
parent 10d172169f
commit a24336b524
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -16,7 +16,7 @@ deps = {
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@407b39301e71006b68bd38e770f35d32398a7b14",
"third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@d38d7c6628bebd02692cfdd6fa76b4d992a35b75",
"third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git@2.0.0",
"third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@v1.6.37",
"third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@386707c6d19b974ca2e3db7f5c61873813c6fe44",
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v1.0.2-rc1",
"third_party/externals/lua" : "https://skia.googlesource.com/external/github.com/lua/lua.git@v5-3-4",
"third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",

6
third_party/libpng/BUILD.gn vendored
View File

@ -48,12 +48,6 @@ if (skia_use_system_libpng) {
"../externals/libpng/arm/filter_neon_intrinsics.c",
"../externals/libpng/arm/palette_neon_intrinsics.c",
]
if (is_clang && is_win) {
# TODO(mtklein): libpng includes arm64_neon.h in clang-cl.exe builds,
# where it should only do that in cl.exe builds, continuing to use
# arm_neon.h with Clang. Until that's fixed, NEON code won't build.
defines += [ "PNG_ARM_NEON_OPT=0" ]
}
}
if (current_cpu == "x86" || current_cpu == "x64") {