summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-04-26 13:16:20 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-04-26 13:16:20 +0200
commitb6fa6782caa03128ccd7b575856b7dbcd239d789 (patch)
treea69575eedfd0de2f1f1d0e8658b60c39b89a6667
parenteebe797382fc8498449709bdf6d3cf511b9075d0 (diff)
Drop support for OS X Leopard (10.5)
We built with 10.6 as minimum version anyway and e.g. osxvideosink does not even work anymore with 10.6.
-rw-r--r--cerbero/enums.py1
-rw-r--r--cerbero/utils/__init__.py2
-rw-r--r--config/darwin.config18
-rw-r--r--recipes/gst-plugins-bad-1.0-static.recipe2
-rw-r--r--recipes/gst-plugins-bad-1.0.recipe2
-rw-r--r--test/test_cerbero_packages_packagemaker.py2
6 files changed, 4 insertions, 23 deletions
diff --git a/cerbero/enums.py b/cerbero/enums.py
index 3bf588ec..a05008b4 100644
--- a/cerbero/enums.py
+++ b/cerbero/enums.py
@@ -84,7 +84,6 @@ class DistroVersion:
OS_X_MOUNTAIN_LION = 'osx_mountain_lion'
OS_X_LION = 'osx_lion'
OS_X_SNOW_LEOPARD = 'osx_snow_leopard'
- OS_X_LEOPARD = 'osx_leopard'
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 8f1f3ed4..f46006a3 100644
--- a/cerbero/utils/__init__.py
+++ b/cerbero/utils/__init__.py
@@ -208,8 +208,6 @@ def system_info():
distro_version = DistroVersion.OS_X_LION
elif ver.startswith('10.6'):
distro_version = DistroVersion.OS_X_SNOW_LEOPARD
- elif ver.startswith('10.5'):
- distro_version = DistroVersion.OS_X_LEOPARD
else:
raise FatalError("Mac version %s not supported" % ver)
diff --git a/config/darwin.config b/config/darwin.config
index 0b4e6858..863e7640 100644
--- a/config/darwin.config
+++ b/config/darwin.config
@@ -19,23 +19,7 @@ elif target_arch == Architecture.PPC:
elif target_arch == Architecture.UNIVERSAL:
build='universal-apple-darwinx'
-if distro_version == DistroVersion.OS_X_LEOPARD:
- # autotools in OSX 10.5 (Leopard) are a bit oldy/broken.
- # Bootstraping the system with macports seems to be enough to build.
- # sudo port install git automake libtool gtk-doc
- # The following enviorenment variables are needed in order to use the macports
- # libtoolize and libtool.
- os.environ['LIBTOOLIZE'] = 'glibtoolize'
- os.environ['LIBTOOL'] = 'glibtool'
- # XCode 3.1.4 comes with two versions of gcc. Using the newest one allows
- # build gmp without needing to patch it.
- os.environ['CC'] = 'gcc-4.2'
- os.environ['OBJC'] = 'gcc-4.2'
- os.environ['CXX'] = 'g++-4.2'
- os.environ['CPP'] = 'cpp-4.2'
-
SDK_VERSION = {
- DistroVersion.OS_X_LEOPARD: '10.5',
DistroVersion.OS_X_SNOW_LEOPARD: '10.6',
DistroVersion.OS_X_LION: '10.7',
DistroVersion.OS_X_MOUNTAIN_LION: '10.8',
@@ -43,7 +27,7 @@ SDK_VERSION = {
}
# The SDK target can be overriden in configure with 'osx_target_sdk_version' for instance
-# to target the 10.5 SDK
+# to target the 10.6 SDK
sdk_version = osx_target_sdk_version or SDK_VERSION[distro_version]
# For Xcode >= 4.3, the SDK is installed in a completely different path
diff --git a/recipes/gst-plugins-bad-1.0-static.recipe b/recipes/gst-plugins-bad-1.0-static.recipe
index 4c691876..d1ff5f28 100644
--- a/recipes/gst-plugins-bad-1.0-static.recipe
+++ b/recipes/gst-plugins-bad-1.0-static.recipe
@@ -162,7 +162,7 @@ class Recipe(custom.GStreamerStatic):
self.configure_options += ' --disable-gst-debug'
if self.config.target_platform == Platform.DARWIN and \
- self.config.target_distro_version in [ DistroVersion.OS_X_LEOPARD, DistroVersion.OS_X_SNOW_LEOPARD, DistroVersion.OS_X_LION ]:
+ self.config.target_distro_version in [ DistroVersion.OS_X_SNOW_LEOPARD, DistroVersion.OS_X_LION ]:
# we won't build applemedia plugin because we don't have videotoolbox
self.platform_files_plugins_sys_devel[Platform.DARWIN].remove('libgstapplemedia')
self.platform_files_plugins_sys_devel[Platform.DARWIN].remove('libgstapplemedia_nonpublic')
diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe
index 43c6d676..c04bbace 100644
--- a/recipes/gst-plugins-bad-1.0.recipe
+++ b/recipes/gst-plugins-bad-1.0.recipe
@@ -179,7 +179,7 @@ class Recipe(recipe.Recipe):
self.configure_options += ' --disable-gst-debug'
if self.config.target_platform == Platform.DARWIN and \
- self.config.target_distro_version in [ DistroVersion.OS_X_LEOPARD, DistroVersion.OS_X_SNOW_LEOPARD, DistroVersion.OS_X_LION ]:
+ self.config.target_distro_version in [ DistroVersion.OS_X_SNOW_LEOPARD, DistroVersion.OS_X_LION ]:
# we won't build applemedia plugin because we don't have videotoolbox
self.platform_files_plugins_sys[Platform.DARWIN].remove('lib/gstreamer-1.0/libgstapplemedia%(mext)s')
self.platform_files_plugins_sys[Platform.DARWIN].remove('lib/gstreamer-1.0/libgstapplemedia_nonpublic%(mext)s')
diff --git a/test/test_cerbero_packages_packagemaker.py b/test/test_cerbero_packages_packagemaker.py
index 8e755bea..75d55f0d 100644
--- a/test/test_cerbero_packages_packagemaker.py
+++ b/test/test_cerbero_packages_packagemaker.py
@@ -95,5 +95,5 @@ class TestPackageMaker(unittest.TestCase):
pm.create_package('root', 'pkg_id', 'version', 'title',
'output_file', 'destination')
self.assertEquals(pm.cmd,
- "./PackageMaker -g '10.5' -i 'pkg_id' -l 'destination' -o 'output_file' "
+ "./PackageMaker -g '10.6' -i 'pkg_id' -l 'destination' -o 'output_file' "
"-n 'version' -r 'root' -t 'title'")