Attachment 74920 Details for Bug 60939 – Changes needed for Arch Linux

Changes needed for Arch Linux

archlinux.patch (text/plain), 4.36 KB, created by Lubosz Sarnecki on 2013-02-16 03:02:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubosz Sarnecki

Created: 2013-02-16 03:02:29 UTC

Size: 4.36 KB

patch

obsolete

>diff --git a/cerbero-uninstalled b/cerbero-uninstalled
>index 6c74173..6a906df 100755
>--- a/cerbero-uninstalled
>+++ b/cerbero-uninstalled
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/env python2
> import sys
> import os
> 
>diff --git a/cerbero/bootstrap/linux.py b/cerbero/bootstrap/linux.py
>index 6d81516..d154ddf 100644
>--- a/cerbero/bootstrap/linux.py
>+++ b/cerbero/bootstrap/linux.py
>@@ -96,8 +96,25 @@ class OpenSuseBootstraper (UnixBootstraper):
>             'xorg-x11-libXv-devel', 'Mesa-devel', 'python-devel',
>             'patterns-openSUSE-devel_rpm_build', 'wget', 'glib-networking']
> 
>+class ArchBootstraper (UnixBootstraper):
>+
>+    tool = 'sudo pacman -S %s --needed'
>+    packages = ['intltool', 'cmake', 'doxygen', 'gtk-doc',
>+            'libtool', 'bison', 'flex', 'automake', 'autoconf', 'make',
>+            'curl', 'gettext', 'alsa-lib', 'yasm', 'gperf',
>+            'docbook-xsl', 'transfig', 'libxrender',
>+            'libxv', 'mesa', 'python2', 'wget', 'glib-networking']
>+            
>+    def __init__(self, config):
>+        UnixBootstraper.__init__(self, config)
>+        if self.config.arch == Architecture.X86_64:
>+            self.packages.append('gcc-multilib')
>+        else:
>+            self.packages.append('gcc')
>+
> 
> def register_all():
>     register_bootstraper(Distro.DEBIAN, DebianBootstraper)
>     register_bootstraper(Distro.REDHAT, RedHatBootstraper)
>     register_bootstraper(Distro.SUSE, OpenSuseBootstraper)
>+    register_bootstraper(Distro.ARCH, ArchBootstraper)
>diff --git a/cerbero/enums.py b/cerbero/enums.py
>index a67510c..0bfa6e2 100644
>--- a/cerbero/enums.py
>+++ b/cerbero/enums.py
>@@ -41,6 +41,7 @@ class Distro:
>     REDHAT = 'redhat'
>     SUSE = 'suse'
>     WINDOWS = 'windows'
>+    ARCH = 'arch'
>     OS_X = 'osx'
>     ANDROID = 'android'
> 
>@@ -59,6 +60,7 @@ class DistroVersion:
>     FEDORA_17 = 'fedora_17'
>     FEDORA_18 = 'fedora_18'
>     REDHAT_6 = 'redhat_6'
>+    ARCH_ROLLING = 'rolling'
>     OPENSUSE_12_1 = 'opensuse_12_1'
>     WINDOWS_XP = 'windows_xp'
>     WINDOWS_VISTA = 'windows_vista'
>diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py
>index 74db11a..4f19805 100644
>--- a/cerbero/utils/__init__.py
>+++ b/cerbero/utils/__init__.py
>@@ -167,6 +167,9 @@ def system_info():
>                 # FIXME Fill this
>                 raise FatalError("Distribution OpenSuse '%s' "
>                                  "not supported" % str(d))
>+        elif "ARCH" in pplatform.release():
>+            distro = Distro.ARCH
>+            distro_version = DistroVersion.ARCH_ROLLING
>         else:
>             raise FatalError("Distribution '%s' not supported" % str(d))
>     elif platform == Platform.WINDOWS:
>diff --git a/recipes/gst-plugins-base.recipe b/recipes/gst-plugins-base.recipe
>index ec02193..0680729 100644
>--- a/recipes/gst-plugins-base.recipe
>+++ b/recipes/gst-plugins-base.recipe
>@@ -126,6 +126,6 @@ class Recipe(recipe.Recipe):
>         if self.config.target_platform in [Platform.WINDOWS, Platform.DARWIN, Platform.ANDROID]:
>             self.configure_options += ' --disable-gtk-doc' 
>         if self.config.target_platform == Platform.ANDROID:
>-            self.configure_options += ' --disable-alsa'
>+            self.configure_options += ' --disable-alsa --disable-x'
>         if self.config.variants.nodebug:
>             self.configure_options += ' --disable-gst-debug'
>diff --git a/recipes/gst-plugins-good.recipe b/recipes/gst-plugins-good.recipe
>index 827a233..3455e4e 100644
>--- a/recipes/gst-plugins-good.recipe
>+++ b/recipes/gst-plugins-good.recipe
>@@ -111,7 +111,7 @@ class Recipe(recipe.Recipe):
>         if self.config.target_platform == Platform.DARWIN:
>             self.configure_options += '--disable-gtk-doc'
>         if self.config.target_platform == Platform.ANDROID:
>-            self.configure_options += '--disable-pulse'
>+            self.configure_options += '--disable-pulse --disable-x'
>         if self.config.target_platform == Platform.LINUX:
>             self.use_system_libs = True
>         if self.config.variants.nodebug:
>diff --git a/recipes/pango.recipe b/recipes/pango.recipe
>index be2dbf8..ee2684b 100644
>--- a/recipes/pango.recipe
>+++ b/recipes/pango.recipe
>@@ -28,5 +28,5 @@ class Recipe(recipe.Recipe):
>     }
> 
>     def prepare(self):
>-        if self.config.target_platform == Platform.DARWIN:
>+        if self.config.target_platform in [Platform.DARWIN, Platform.ANDROID]:
>             self.configure_options += ' --without-x '

Actions: View

Attachments on bug 60939: 74920 | 74921 | 100892 | 100893 | 100894 | 100895 | 100896 | 100897

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.