Revert of Update libjpeg-turbo to 1.4.90 (patchset #1 id:20001 of https://codereview...

Reason for revert:
Clang wants "strbeq" and gcc wants "streqb".  Uggh.

https://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-Arm7-Debug-Android/builds/1766/steps/compile_skia%20on%20Mac/logs/stdio

Original issue's description:
> Update libjpeg-turbo to 1.4.90
>
> Google3, Chrome, and Android are considering updates.  Let's start
> testing Skia on the newest version.
> https://critique.corp.google.com/#review/116667446
> https://codereview.chromium.org/1934113002
> https://buganizer.corp.google.com/u/0/issues/28268702
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
>
> Committed: https://skia.googlesource.com/skia/+/3994c161ec5a2b83e8f6bab4d9c469eec2668d92

TBR=scroggo@google.com,djsollen@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review-Url: https://codereview.chromium.org/1937143002

diff --git a/DEPS b/DEPS
index a25635be20e87e84ebeffaf68c0168652b4639fb..1b38961d01f7e53b485488824ca4881e6dfb208b 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -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@e604eb4b007012e727483784a67c757d49f714c9",
+  "third_party/externals/libjpeg-turbo"             : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@b38b934d246fca482eb6801f4ce79422954a635e",
   # 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 c0853d890ddee1672ee2e98bc7c4ce16d3ed91c6..801b21e61231aba2cf0c5d43a3777d4be6ebd6f2 100644 (file)
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -132,8 +132,7 @@
             '../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/jchuff-sse2.asm', 
+            '../third_party/externals/libjpeg-turbo/simd/jcgray-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', 
@@ -170,7 +169,6 @@
             '../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',