From 5ff0e973a90ccc396a54f62de582ade46be070d6 Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Wed, 3 Apr 2013 22:51:42 +0000
Subject: [PATCH] Disable JPEG for IOS BUG=212 TESTED=Windows built/ran and did
 not run jpeg unittest out\release\libyuv_unittest --gtest_filter=*J* Review
 URL: https://webrtc-codereview.appspot.com/1280005

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

diff --git a/README.chromium b/README.chromium
index ffd39ac75..83cc88537 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 634
+Version: 638
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 801757f5e..a32a9b7cb 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 634
+#define LIBYUV_VERSION 638
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/libyuv.gyp b/libyuv.gyp
index d8994e535..e9282588b 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -13,23 +13,30 @@
   'targets': [
     {
       'target_name': 'libyuv',
+      # Change type to 'shared_library' to build .so or .dll files.
       'type': 'static_library',
-      # 'type': 'shared_library',
       'conditions': [
-         ['use_system_libjpeg==0', {
-          'dependencies': [
-             '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+        # TODO(fbarchard): Use gyp define to enable jpeg.
+        [ 'OS != "ios"', {
+          'defines': [
+            'HAVE_JPEG'
+          ],
+          'conditions': [
+            [ 'use_system_libjpeg==0', {
+              'dependencies': [
+                 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+              ],
+            }, {
+              'link_settings': {
+                'libraries': [
+                  '-ljpeg',
+                ],
+              },
+            }],
           ],
-        }, {
-          'link_settings': {
-            'libraries': [
-              '-ljpeg',
-            ],
-          },
         }],
       ],
       'defines': [
-        'HAVE_JPEG',
         # Enable the following 3 macros to turn off assembly for specified CPU.
         # 'LIBYUV_DISABLE_X86',
         # 'LIBYUV_DISABLE_NEON',
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 1b81752c7..2c49a2cbc 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -18,7 +18,6 @@
         'testing/gtest.gyp:gtest_main',
       ],
       'defines': [
-        'HAVE_JPEG',
         'LIBYUV_SVNREVISION="<!(svnversion -n)"',
         # Enable the following 3 macros to turn off assembly for specified CPU.
         # 'LIBYUV_DISABLE_X86',
@@ -51,6 +50,11 @@
             '-fexceptions',
           ],
         }],
+        [ 'OS != "ios"', {
+          'defines': [
+            'HAVE_JPEG',
+          ],
+        }],
       ], # conditions
     },