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

Revert of Roll libwebp to v0.4.2 (latest stable) to fix annoying build warning. (patchset #1 id:1 of https://codereview.chromium.org/807553002/)

Browse Source 
Reason for revert:
uses __builtins not available on all our compilers

Original issue's description:
> Roll libwebp to v0.4.2 (latest stable) to fix annoying build warning.
>
> This warning should now go away:
>
> ../../third_party/externals/libwebp/src/enc/quant.c:105:23: warning: unused variable 'kCoeffThresh' [-Wunused-const-variable]
> static const uint16_t kCoeffThresh[16] = {
>
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/e655557a551c545f4153b0764269298cd01cd0c0

TBR=caryclark@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/795823005
This commit is contained in:
mtklein 2014-12-15 12:23:00 -08:00 committed by Commit bot
parent e655557a55
commit 449998d3f0
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -15,7 +15,7 @@ deps = {
"third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35",
"third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@1afff032c83e26ddf7f2776e8b43de5ad666c1fa",
"third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3",
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.4.2",
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39",
"third_party/externals/nanomsg": "https://skia.googlesource.com/third_party/nanomsg.git@0.4-beta",
"platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-4.2.2_r1.2",

13
gyp/libwebp.gyp
View File

@ -28,6 +28,7 @@
'../third_party/externals/libwebp/src/dec/frame.c',
'../third_party/externals/libwebp/src/dec/idec.c',
'../third_party/externals/libwebp/src/dec/io.c',
'../third_party/externals/libwebp/src/dec/layer.c',
'../third_party/externals/libwebp/src/dec/quant.c',
'../third_party/externals/libwebp/src/dec/tree.c',
'../third_party/externals/libwebp/src/dec/vp8.c',
@ -54,20 +55,15 @@
'../third_party/externals/libwebp',
],
'sources': [
'../third_party/externals/libwebp/src/dsp/alpha_processing.c',
'../third_party/externals/libwebp/src/dsp/alpha_processing_sse2.c',
'../third_party/externals/libwebp/src/dsp/cpu.c',
'../third_party/externals/libwebp/src/dsp/dec.c',
'../third_party/externals/libwebp/src/dsp/dec_clip_tables.c',
'../third_party/externals/libwebp/src/dsp/dec_sse2.c',
'../third_party/externals/libwebp/src/dsp/enc.c',
'../third_party/externals/libwebp/src/dsp/enc_sse2.c',
'../third_party/externals/libwebp/src/dsp/lossless.c',
'../third_party/externals/libwebp/src/dsp/lossless_sse2.c',
'../third_party/externals/libwebp/src/dsp/upsampling.c',
'../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
'../third_party/externals/libwebp/src/dsp/yuv.c',
'../third_party/externals/libwebp/src/dsp/yuv_sse2.c',
],
'cflags': [ '-w' ],
'conditions': [
@ -89,7 +85,6 @@
'sources': [
'../third_party/externals/libwebp/src/dsp/dec_neon.c',
'../third_party/externals/libwebp/src/dsp/enc_neon.c',
'../third_party/externals/libwebp/src/dsp/lossless_neon.c',
'../third_party/externals/libwebp/src/dsp/upsampling_neon.c',
],
# behavior similar dsp_neon.c.neon in an Android.mk
@ -118,11 +113,8 @@
'../third_party/externals/libwebp/src/enc/frame.c',
'../third_party/externals/libwebp/src/enc/histogram.c',
'../third_party/externals/libwebp/src/enc/iterator.c',
'../third_party/externals/libwebp/src/enc/layer.c',
'../third_party/externals/libwebp/src/enc/picture.c',
'../third_party/externals/libwebp/src/enc/picture_csp.c',
'../third_party/externals/libwebp/src/enc/picture_psnr.c',
'../third_party/externals/libwebp/src/enc/picture_rescale.c',
'../third_party/externals/libwebp/src/enc/picture_tools.c',
'../third_party/externals/libwebp/src/enc/quant.c',
'../third_party/externals/libwebp/src/enc/syntax.c',
'../third_party/externals/libwebp/src/enc/token.c',
@ -147,7 +139,6 @@
'../third_party/externals/libwebp/src/utils/huffman_encode.c',
'../third_party/externals/libwebp/src/utils/quant_levels.c',
'../third_party/externals/libwebp/src/utils/quant_levels_dec.c',
'../third_party/externals/libwebp/src/utils/random.c',
'../third_party/externals/libwebp/src/utils/rescaler.c',
'../third_party/externals/libwebp/src/utils/thread.c',
'../third_party/externals/libwebp/src/utils/utils.c',