diff options
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | gyp/libjpeg-turbo.gyp | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -24,7 +24,7 @@ deps = { "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae", "third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@be908191d0a6883a95333bdc0bca749c9b830969", - "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@b38b934d246fca482eb6801f4ce79422954a635e", + "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@e604eb4b007012e727483784a67c757d49f714c9", # libjpeg-turbo depends on yasm to compile .asm files "third_party/externals/yasm/source/patched-yasm/" : "https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@4671120cd8558ce62ee8672ebf3eb6f5216f909b", "third_party/externals/yasm/binaries" : "https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881", diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp index 801b21e612..c0853d890d 100644 --- a/gyp/libjpeg-turbo.gyp +++ b/gyp/libjpeg-turbo.gyp @@ -132,7 +132,8 @@ '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm', '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm', '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm', - '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm', + '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm', + '../third_party/externals/libjpeg-turbo/simd/jchuff-sse2.asm', '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm', '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm', '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm', @@ -169,6 +170,7 @@ '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c', '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm', '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm', + '../third_party/externals/libjpeg-turbo/simd/jchuff-sse2-64.asm', '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm', '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm', '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm', |