From db4ba3545c9408c113f83e0ea33b020580257d28 Mon Sep 17 00:00:00 2001
From: Sebastian Dröge <sebastian@centricular.com>
Date: Thu, 9 Oct 2014 10:28:52 +0300
Subject: osx: Add support for yosemite

---
 cerbero/enums.py          | 1 +
 cerbero/utils/__init__.py | 4 +++-
 config/darwin.config      | 1 +
 recipes/libvpx.recipe     | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cerbero/enums.py b/cerbero/enums.py
index b6564cb9..8a80da67 100644
--- a/cerbero/enums.py
+++ b/cerbero/enums.py
@@ -86,6 +86,7 @@ class DistroVersion:
     OS_X_MOUNTAIN_LION = 'osx_mountain_lion'
     OS_X_LION = 'osx_lion'
     OS_X_SNOW_LEOPARD = 'osx_snow_leopard'
+    OS_X_YOSEMITE = 'osx_yosemite'
     IOS_6_0 = 'ios_6_0'
     IOS_6_1 = 'ios_6_1'
     IOS_7_0 = 'ios_7_0'
diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py
index d5fc2eb5..3be85f49 100644
--- a/cerbero/utils/__init__.py
+++ b/cerbero/utils/__init__.py
@@ -204,7 +204,9 @@ def system_info():
     elif platform == Platform.DARWIN:
         distro = Distro.OS_X
         ver = pplatform.mac_ver()[0]
-        if ver.startswith('10.9'):
+        if ver.startswith('10.10'):
+            distro_version = DistroVersion.OS_X_YOSEMITE
+        elif ver.startswith('10.9'):
             distro_version = DistroVersion.OS_X_MAVERICKS
         elif ver.startswith('10.8'):
             distro_version = DistroVersion.OS_X_MOUNTAIN_LION
diff --git a/config/darwin.config b/config/darwin.config
index c695c35c..fdfeada4 100644
--- a/config/darwin.config
+++ b/config/darwin.config
@@ -27,6 +27,7 @@ SDK_VERSION = {
     DistroVersion.OS_X_LION: '10.7',
     DistroVersion.OS_X_MOUNTAIN_LION: '10.8',
     DistroVersion.OS_X_MAVERICKS: '10.9',
+    DistroVersion.OS_X_YOSEMITE: '10.10',
 }
 
 # The SDK target can be overriden in configure with 'osx_target_sdk_version' for instance
diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe
index 89941425..d1890dbd 100644
--- a/recipes/libvpx.recipe
+++ b/recipes/libvpx.recipe
@@ -52,7 +52,8 @@ class Recipe(recipe.Recipe):
         self.new_env['LD'] = os.environ.get('CC', 'gcc')
         if self.config.target_platform == Platform.DARWIN:
             if self.config.target_distro_version in [DistroVersion.OS_X_MOUNTAIN_LION,
-                    DistroVersion.OS_X_LION, DistroVersion.OS_X_MAVERICKS] and arch != 'x86':
+                    DistroVersion.OS_X_LION, DistroVersion.OS_X_MAVERICKS,
+                    DistroVersion.OS_X_YOSEMITE] and arch != 'x86':
                 platform = 'darwin11'
             else:
                 platform = 'darwin10'
-- 
cgit v1.2.3