From 724d0c1b8ee34b9173b959f1bf9756625f71830e Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Thu, 23 Feb 2012 00:25:29 +0000
Subject: [PATCH] gyp build for jpeg BUG=none TEST=none Review URL:
 https://webrtc-codereview.appspot.com/392022

git-svn-id: http://libyuv.googlecode.com/svn/trunk@184 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 DEPS                     | 21 ++++++++++++++++++++-
 README.chromium          |  2 +-
 include/libyuv/version.h |  2 +-
 libyuv.gyp               |  6 +++---
 libyuv_test.gyp          |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/DEPS b/DEPS
index 1b79d1f61..7e86be954 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "libyuv_trunk" : "https://libyuv.googlecode.com/svn/trunk",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "95033",
+  "chromium_revision": "120526",
   # Use this googlecode_url variable only if there is an internal mirror for it.
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
@@ -20,12 +20,31 @@ deps = {
   "trunk/tools/gyp":
     (Var("googlecode_url") % "gyp") + "/trunk@985",
 
+  # Needed by build/common.gypi.
+  "trunk/tools/win/supalink":
+    Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
+
   # Dependencies used by libjpeg-turbo
+  # Optional jpeg decoder
   "trunk/third_party/libjpeg_turbo/":
     Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@119959",
 
+  # Yasm assember required for libjpeg_turbo
   "trunk/third_party/yasm/":
     Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
+
+  "trunk/third_party/yasm/source/patched-yasm":
+   Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
+
+  "trunk/third_party/yasm/binaries":
+   Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228",
+}
+
+deps_os = {
+  "win": {
+    "trunk/third_party/cygwin/":
+      Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
+  }
 }
 
 hooks = [
diff --git a/README.chromium b/README.chromium
index 8eab14b37..c94435c7e 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 183
+Version: 184
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index f71c1d660..a806de4a9 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,7 +11,7 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 183
+#define LIBYUV_VERSION 184
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 
diff --git a/libyuv.gyp b/libyuv.gyp
index f1ded26c2..f651212ee 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -12,12 +12,12 @@
       'target_name': 'libyuv',
       'type': 'static_library',
       'defines': [
-        #'HAVE_JPEG',
+        'HAVE_JPEG',
       ],
       'include_dirs': [
         'include',
         '.',
-	#'third_party/libjpeg_turbo',
+        'third_party/libjpeg_turbo',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -46,7 +46,7 @@
         'source/cpu_id.cc',
         'source/format_conversion.cc',
         'source/planar_functions.cc',
-        #'source/mjpeg_decoder.cc',
+        'source/mjpeg_decoder.cc',
         'source/rotate.cc',
         'source/rotate_neon.cc',
         'source/row_common.cc',
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 24e7892bf..78c920a54 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -16,7 +16,7 @@
          # The tests are based on gtest
          'testing/gtest.gyp:gtest',
          'testing/gtest.gyp:gtest_main',
-         #'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+         'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
       ],
       'sources': [
          # headers