projects / platform / upstream / libSkiaSharp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e2f6ffb)
Revert "Update libwebp to 0.6.0-pre"
authorEthan Nicholas <ethannicholas@google.com>
Mon, 23 Jan 2017 20:47:36 +0000 (20:47 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Mon, 23 Jan 2017 20:47:46 +0000 (20:47 +0000)
This reverts commit e2f6ffbf49671713356881af70a093e99e80bd31.

Reason for revert:

iOS build failures, see https://luci-milo.appspot.com/swarming/task/33e5e02cf8419d10/steps/build_iOSShell/0/stdout

Original change's description:
> Update libwebp to 0.6.0-pre
>
> Corresponds with Android change
> https://android-review.googlesource.com/#/c/326439/
>
> "this prerelease snapshot includes encoder and performance
> improvements"
>
> Update build file
> * Many files have been renamed from
>     src/<subdir>/<name>.c
>       to
>     src/<subdir>/<name>_<subdir>.c
>
> * Build new files (*_msa.c, *_neon.c, predictor_enc.c)
>
> This should fix issue 5876, which was caused by a compiler bug.
> With the added NEON implementation, we will no longer trigger
> the bug.
>
> BUG=skia:5876
>
> Change-Id: I0fcce4362ee70138547b1d23aa9ef537a4126e73
> Reviewed-on: https://skia-review.googlesource.com/7376
> Reviewed-by: Matt Sarett <msarett@google.com>
> Commit-Queue: Leon Scroggins <scroggo@google.com>
>

TBR=msarett@google.com,scroggo@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5876

Change-Id: Ib81f63861d9f1c6936bd7f790b5e16a9544a4df0
Reviewed-on: https://skia-review.googlesource.com/7420
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
DEPS patch | blob | history
third_party/libwebp/BUILD.gn patch | blob | history

diff --git a/DEPS b/DEPS
index b89bc0f..f42e7d4 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -15,7 +15,7 @@ deps = {
   "third_party/externals/gyp"     : "https://chromium.googlesource.com/external/gyp.git@87ac4d0e63fc7dd8152a350327fea8dcf031bf56",
   "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@1.3.0",
   "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0",
-  "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@84cef16",
+  "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.5.2-rc2",
   "third_party/externals/zlib"    : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4576304a4b9835aa8646c9735b079e1d96858633",
 
   "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn
index 1157e4b..e7dc336 100644 (file)
--- a/third_party/libwebp/BUILD.gn
+++ b/third_party/libwebp/BUILD.gn
@@ -35,20 +35,19 @@ if (skia_use_system_libwebp) {
     ]
 
     sources = [
-      "../externals/libwebp/src/dec/alpha_dec.c",
-      "../externals/libwebp/src/dec/buffer_dec.c",
-      "../externals/libwebp/src/dec/frame_dec.c",
-      "../externals/libwebp/src/dec/idec_dec.c",
-      "../externals/libwebp/src/dec/io_dec.c",
-      "../externals/libwebp/src/dec/quant_dec.c",
-      "../externals/libwebp/src/dec/tree_dec.c",
-      "../externals/libwebp/src/dec/vp8_dec.c",
-      "../externals/libwebp/src/dec/vp8l_dec.c",
-      "../externals/libwebp/src/dec/webp_dec.c",
+      "../externals/libwebp/src/dec/alpha.c",
+      "../externals/libwebp/src/dec/buffer.c",
+      "../externals/libwebp/src/dec/frame.c",
+      "../externals/libwebp/src/dec/idec.c",
+      "../externals/libwebp/src/dec/io.c",
+      "../externals/libwebp/src/dec/quant.c",
+      "../externals/libwebp/src/dec/tree.c",
+      "../externals/libwebp/src/dec/vp8.c",
+      "../externals/libwebp/src/dec/vp8l.c",
+      "../externals/libwebp/src/dec/webp.c",
       "../externals/libwebp/src/demux/demux.c",
       "../externals/libwebp/src/dsp/alpha_processing.c",
       "../externals/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/alpha_processing_neon.c",
       "../externals/libwebp/src/dsp/alpha_processing_sse2.c",
       "../externals/libwebp/src/dsp/alpha_processing_sse41.c",
       "../externals/libwebp/src/dsp/argb.c",
@@ -70,75 +69,67 @@ if (skia_use_system_libwebp) {
       "../externals/libwebp/src/dsp/enc_avx2.c",
       "../externals/libwebp/src/dsp/enc_mips32.c",
       "../externals/libwebp/src/dsp/enc_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/enc_msa.c",
       "../externals/libwebp/src/dsp/enc_neon.c",
       "../externals/libwebp/src/dsp/enc_sse2.c",
       "../externals/libwebp/src/dsp/enc_sse41.c",
       "../externals/libwebp/src/dsp/filters.c",
       "../externals/libwebp/src/dsp/filters_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/filters_msa.c",
-      "../externals/libwebp/src/dsp/filters_neon.c",
       "../externals/libwebp/src/dsp/filters_sse2.c",
       "../externals/libwebp/src/dsp/lossless.c",
       "../externals/libwebp/src/dsp/lossless_enc.c",
       "../externals/libwebp/src/dsp/lossless_enc_mips32.c",
       "../externals/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/lossless_enc_msa.c",
       "../externals/libwebp/src/dsp/lossless_enc_neon.c",
       "../externals/libwebp/src/dsp/lossless_enc_sse2.c",
       "../externals/libwebp/src/dsp/lossless_enc_sse41.c",
       "../externals/libwebp/src/dsp/lossless_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/lossless_msa.c",
       "../externals/libwebp/src/dsp/lossless_neon.c",
       "../externals/libwebp/src/dsp/lossless_sse2.c",
       "../externals/libwebp/src/dsp/rescaler.c",
       "../externals/libwebp/src/dsp/rescaler_mips32.c",
       "../externals/libwebp/src/dsp/rescaler_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/rescaler_msa.c",
       "../externals/libwebp/src/dsp/rescaler_neon.c",
       "../externals/libwebp/src/dsp/rescaler_sse2.c",
       "../externals/libwebp/src/dsp/upsampling.c",
       "../externals/libwebp/src/dsp/upsampling_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/upsampling_msa.c",
       "../externals/libwebp/src/dsp/upsampling_neon.c",
       "../externals/libwebp/src/dsp/upsampling_sse2.c",
       "../externals/libwebp/src/dsp/yuv.c",
       "../externals/libwebp/src/dsp/yuv_mips32.c",
       "../externals/libwebp/src/dsp/yuv_mips_dsp_r2.c",
       "../externals/libwebp/src/dsp/yuv_sse2.c",
-      "../externals/libwebp/src/enc/alpha_enc.c",
-      "../externals/libwebp/src/enc/analysis_enc.c",
-      "../externals/libwebp/src/enc/backward_references_enc.c",
-      "../externals/libwebp/src/enc/config_enc.c",
-      "../externals/libwebp/src/enc/cost_enc.c",
-      "../externals/libwebp/src/enc/filter_enc.c",
-      "../externals/libwebp/src/enc/frame_enc.c",
-      "../externals/libwebp/src/enc/histogram_enc.c",
-      "../externals/libwebp/src/enc/iterator_enc.c",
-      "../externals/libwebp/src/enc/near_lossless_enc.c",
-      "../externals/libwebp/src/enc/picture_csp_enc.c",
-      "../externals/libwebp/src/enc/picture_enc.c",
-      "../externals/libwebp/src/enc/picture_psnr_enc.c",
-      "../externals/libwebp/src/enc/picture_rescale_enc.c",
-      "../externals/libwebp/src/enc/picture_tools_enc.c",
-      "../externals/libwebp/src/enc/predictor_enc.c",
-      "../externals/libwebp/src/enc/quant_enc.c",
-      "../externals/libwebp/src/enc/syntax_enc.c",
-      "../externals/libwebp/src/enc/token_enc.c",
-      "../externals/libwebp/src/enc/tree_enc.c",
-      "../externals/libwebp/src/enc/vp8l_enc.c",
-      "../externals/libwebp/src/enc/webp_enc.c",
-      "../externals/libwebp/src/utils/bit_reader_utils.c",
-      "../externals/libwebp/src/utils/bit_writer_utils.c",
-      "../externals/libwebp/src/utils/color_cache_utils.c",
-      "../externals/libwebp/src/utils/filters_utils.c",
-      "../externals/libwebp/src/utils/huffman_encode_utils.c",
-      "../externals/libwebp/src/utils/huffman_utils.c",
-      "../externals/libwebp/src/utils/quant_levels_dec_utils.c",
-      "../externals/libwebp/src/utils/quant_levels_utils.c",
-      "../externals/libwebp/src/utils/random_utils.c",
-      "../externals/libwebp/src/utils/rescaler_utils.c",
-      "../externals/libwebp/src/utils/thread_utils.c",
+      "../externals/libwebp/src/enc/alpha.c",
+      "../externals/libwebp/src/enc/analysis.c",
+      "../externals/libwebp/src/enc/backward_references.c",
+      "../externals/libwebp/src/enc/config.c",
+      "../externals/libwebp/src/enc/cost.c",
+      "../externals/libwebp/src/enc/filter.c",
+      "../externals/libwebp/src/enc/frame.c",
+      "../externals/libwebp/src/enc/histogram.c",
+      "../externals/libwebp/src/enc/iterator.c",
+      "../externals/libwebp/src/enc/near_lossless.c",
+      "../externals/libwebp/src/enc/picture.c",
+      "../externals/libwebp/src/enc/picture_csp.c",
+      "../externals/libwebp/src/enc/picture_psnr.c",
+      "../externals/libwebp/src/enc/picture_rescale.c",
+      "../externals/libwebp/src/enc/picture_tools.c",
+      "../externals/libwebp/src/enc/quant.c",
+      "../externals/libwebp/src/enc/syntax.c",
+      "../externals/libwebp/src/enc/token.c",
+      "../externals/libwebp/src/enc/tree.c",
+      "../externals/libwebp/src/enc/vp8l.c",
+      "../externals/libwebp/src/enc/webpenc.c",
+      "../externals/libwebp/src/utils/bit_reader.c",
+      "../externals/libwebp/src/utils/bit_writer.c",
+      "../externals/libwebp/src/utils/color_cache.c",
+      "../externals/libwebp/src/utils/filters.c",
+      "../externals/libwebp/src/utils/huffman.c",
+      "../externals/libwebp/src/utils/huffman_encode.c",
+      "../externals/libwebp/src/utils/quant_levels.c",
+      "../externals/libwebp/src/utils/quant_levels_dec.c",
+      "../externals/libwebp/src/utils/random.c",
+      "../externals/libwebp/src/utils/rescaler.c",
+      "../externals/libwebp/src/utils/thread.c",
       "../externals/libwebp/src/utils/utils.c",
     ]
   }
Domain: Dotnet / API;