summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2013-05-10 07:00:54 (GMT)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2013-05-10 07:00:54 (GMT)
commit7316bfbd75055373101e28869b306b01d4fe8796 (patch)
tree8d8239b563cb6ebe71dcb34a046c8ca082a3d52f
parent8a3cf3677b26814d78c91adc6168a8ed114f65d7 (diff)
downloadcerbero-7316bfbd75055373101e28869b306b01d4fe8796.tar.gz
cerbero-7316bfbd75055373101e28869b306b01d4fe8796.tar.xz
Add support for Debian Jessy
-rw-r--r--cerbero/bootstrap/linux.py1
-rw-r--r--cerbero/enums.py1
-rw-r--r--cerbero/utils/__init__.py2
-rw-r--r--packages/gstreamer-1.0-net.package1
-rw-r--r--packages/gstreamer-networking.package1
-rw-r--r--recipes/glib.recipe2
-rw-r--r--recipes/gtk.recipe2
-rw-r--r--recipes/libsoup.recipe1
8 files changed, 9 insertions, 2 deletions
diff --git a/cerbero/bootstrap/linux.py b/cerbero/bootstrap/linux.py
index 7eabe5a..8ff3ba1 100644
--- a/cerbero/bootstrap/linux.py
+++ b/cerbero/bootstrap/linux.py
@@ -55,6 +55,7 @@ class DebianBootstraper (UnixBootstraper):
DistroVersion.UBUNTU_LUCID: ['libgtk2.0-dev'],
DistroVersion.UBUNTU_NATTY: ['libgtk2.0-dev'],
DistroVersion.DEBIAN_WHEEZY: ['libgdk-pixbuf2.0-dev'],
+ DistroVersion.DEBIAN_JESSY: ['libgdk-pixbuf2.0-dev'],
DistroVersion.UBUNTU_ONEIRIC: ['libgdk-pixbuf2.0-dev'],
DistroVersion.UBUNTU_PRECISE: ['libgdk-pixbuf2.0-dev'],
}
diff --git a/cerbero/enums.py b/cerbero/enums.py
index c109368..71c45ef 100644
--- a/cerbero/enums.py
+++ b/cerbero/enums.py
@@ -51,6 +51,7 @@ class DistroVersion:
''' Enumeration of supported distribution versions '''
DEBIAN_SQUEEZE = 'debian_squeeze'
DEBIAN_WHEEZY = 'debian_wheezy'
+ DEBIAN_JESSY = 'debian_jessy'
UBUNTU_MAVERICK = 'ubuntu_maverick'
UBUNTU_LUCID = 'ubuntu_lucid'
UBUNTU_NATTY = 'ubuntu_natty'
diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py
index f5cc16b..40ef7f3 100644
--- a/cerbero/utils/__init__.py
+++ b/cerbero/utils/__init__.py
@@ -148,6 +148,8 @@ def system_info():
distro_version = DistroVersion.DEBIAN_SQUEEZE
elif d[1].startswith('7.') or d[1].startswith('wheezy'):
distro_version = DistroVersion.DEBIAN_WHEEZY
+ elif d[1].startswith('jessy'):
+ distro_version = DistroVersion.DEBIAN_JESSY
else:
raise FatalError("Distribution '%s' not supported" % str(d))
elif d[0] in ['RedHat', 'Fedora']:
diff --git a/packages/gstreamer-1.0-net.package b/packages/gstreamer-1.0-net.package
index b328c43..b56ff65 100644
--- a/packages/gstreamer-1.0-net.package
+++ b/packages/gstreamer-1.0-net.package
@@ -45,6 +45,7 @@ class Package(package.Package):
if self.config.target_platform != Platform.LINUX or \
self.config.target_distro_version not in \
[DistroVersion.DEBIAN_WHEEZY,
+ DistroVersion.DEBIAN_JESSY,
DistroVersion.UBUNTU_NATTY,
DistroVersion.UBUNTU_ONEIRIC,
DistroVersion.UBUNTU_PRECISE,
diff --git a/packages/gstreamer-networking.package b/packages/gstreamer-networking.package
index e640e2d..bae8cbb 100644
--- a/packages/gstreamer-networking.package
+++ b/packages/gstreamer-networking.package
@@ -45,6 +45,7 @@ class Package(package.Package):
if self.config.target_platform != Platform.LINUX or \
self.config.target_distro_version not in \
[DistroVersion.DEBIAN_WHEEZY,
+ DistroVersion.DEBIAN_JESSY,
DistroVersion.UBUNTU_NATTY,
DistroVersion.UBUNTU_ONEIRIC,
DistroVersion.UBUNTU_PRECISE,
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index 5808da5..3889721 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -104,7 +104,7 @@ class Recipe(recipe.Recipe):
self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/gio/modules/', '/usr/lib/i386-linux-gnu/gio/modules')
elif self.config.target_arch == Architecture.X86_64:
self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/gio/modules/', '/usr/lib/x86_64-linux-gnu/gio/modules')
- elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY]:
+ elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY, DistroVersion.DEBIAN_JESSY]:
if self.config.target_arch == Architecture.X86:
self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/i386-linux-gnu/gio/modules')
elif self.config.target_arch == Architecture.X86_64:
diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe
index b25c439..046d1b6 100644
--- a/recipes/gtk.recipe
+++ b/recipes/gtk.recipe
@@ -87,7 +87,7 @@ class Recipe(recipe.Recipe):
self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/gtk-2.0', '/usr/lib/i386-linux-gnu/gtk-2.0', '/usr/share/themes')
elif self.config.target_arch == Architecture.X86_64:
self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/gtk-2.0', '/usr/lib/x86_64-linux-gnu/gtk-2.0', '/usr/share/themes')
- elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY]:
+ elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_WHEEZY, DistroVersion.DEBIAN_JESSY]:
if self.config.target_arch == Architecture.X86:
self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/i386-linux-gnu/gtk-2.0', None, '/usr/share/themes')
elif self.config.target_arch == Architecture.X86_64:
diff --git a/recipes/libsoup.recipe b/recipes/libsoup.recipe
index 4b908ba..d3a526b 100644
--- a/recipes/libsoup.recipe
+++ b/recipes/libsoup.recipe
@@ -19,6 +19,7 @@ class Recipe(recipe.Recipe):
if self.config.target_platform != Platform.LINUX or \
self.config.target_distro_version not in \
[DistroVersion.DEBIAN_WHEEZY,
+ DistroVersion.DEBIAN_JESSY,
DistroVersion.UBUNTU_NATTY,
DistroVersion.UBUNTU_ONEIRIC,
DistroVersion.UBUNTU_PRECISE,