diff options
| -rw-r--r-- | cerbero/bootstrap/osx.py | 2 | ||||
| -rw-r--r-- | recipes/gconf.recipe | 1 | ||||
| -rw-r--r-- | recipes/gst-plugins-gl-1.0-static.recipe | 25 | ||||
| -rw-r--r-- | recipes/gst-plugins-gl-1.0.recipe | 32 | ||||
| -rw-r--r-- | recipes/mingw-runtime.recipe | 6 | ||||
| -rw-r--r-- | recipes/orbit2.recipe | 1 |
6 files changed, 65 insertions, 2 deletions
diff --git a/cerbero/bootstrap/osx.py b/cerbero/bootstrap/osx.py index a09d413f..bef1aa84 100644 --- a/cerbero/bootstrap/osx.py +++ b/cerbero/bootstrap/osx.py @@ -52,7 +52,7 @@ class OSXBootstraper (BootstraperBase): shell.download(self.CPANM_URL, cpanm_installer) shell.call('chmod +x %s' % cpanm_installer) # Install XML::Parser, required for intltool - shell.call("%s XML::Parser" % cpanm_installer) + shell.call("sudo %s XML::Parser" % cpanm_installer) diff --git a/recipes/gconf.recipe b/recipes/gconf.recipe index 528639a5..da1fefed 100644 --- a/recipes/gconf.recipe +++ b/recipes/gconf.recipe @@ -6,4 +6,5 @@ class Recipe(recipe.Recipe): licenses = [License.LGPL] stype = SourceType.TARBALL url = 'http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-2.32.4.tar.xz' + tarball_dirname = 'GConf-%(version)s' deps = ['orbit2', 'dbus-glib'] diff --git a/recipes/gst-plugins-gl-1.0-static.recipe b/recipes/gst-plugins-gl-1.0-static.recipe new file mode 100644 index 00000000..b28ca8c8 --- /dev/null +++ b/recipes/gst-plugins-gl-1.0-static.recipe @@ -0,0 +1,25 @@ +# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python +from cerbero.utils import shell + +class Recipe(custom.GStreamerStatic): + name = 'gst-plugins-gl-1.0-static' + version = '1.0' + gstreamer_version = '1.0' + licenses = [License.LGPLv2Plus] + config_sh = 'sh ./autogen.sh --noconfigure && ./configure' + extra_configure_options = "--disable-examples " + make_check = None + commit = 'upstream/master' + deps = ['gstreamer', 'gst-plugins-base' ] + + files_plugins_devel = ['libgstopengl'] + + def prepare(self): + if self.config.target_platform != Platform.LINUX: + self.configure_options += ' --disable-gtk-doc' + + super(Recipe, self).prepare() + + self.remotes['origin'] = ('%s/%s' % ('git://anongit.freedesktop.org/gstreamer', 'gst-plugins-gl')) + self.remotes['upstream'] = self.remotes['origin'] + diff --git a/recipes/gst-plugins-gl-1.0.recipe b/recipes/gst-plugins-gl-1.0.recipe new file mode 100644 index 00000000..c43e367f --- /dev/null +++ b/recipes/gst-plugins-gl-1.0.recipe @@ -0,0 +1,32 @@ +# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python +from cerbero.utils import shell + +class Recipe(recipe.Recipe): + name = 'gst-plugins-gl-1.0' + version = '1.0' + licenses = [License.LGPLv2Plus] + config_sh = 'sh ./autogen.sh --noconfigure && ./configure' + configure_options = "--disable-examples " + commit = 'upstream/master' + deps = ['gstreamer', 'gst-plugins-base' ] + + files_libs = ['libgstgl-1.0'] + + files_devel = ['include/gstreamer-1.0/gst/gl', + 'lib/pkgconfig/gstreamer-gl-1.0.pc'] + + files_lang = ['gst-plugins-gl-1.0'] + + files_plugins_gl = ['lib/gstreamer-1.0/libgstopengl%(mext)s'] + + def prepare(self): + self.remotes['origin'] = ('%s/%s' % ('git://anongit.freedesktop.org/gstreamer', 'gst-plugins-gl')) + self.remotes['upstream'] = self.remotes['origin'] + + self.append_env['CFLAGS'] = " -Wno-error " + self.append_env['CXXFLAGS'] = " -Wno-error " + self.append_env['CPPFLAGS'] = " -Wno-error " + + if self.config.target_platform != Platform.LINUX: + self.configure_options += '--disable-gtk-doc ' + diff --git a/recipes/mingw-runtime.recipe b/recipes/mingw-runtime.recipe index fe38ef9d..6c14f0ee 100644 --- a/recipes/mingw-runtime.recipe +++ b/recipes/mingw-runtime.recipe @@ -50,7 +50,11 @@ class Recipe(recipe.Recipe): os.makedirs(os.path.join(self.config.prefix, 'bin')) if not os.path.exists(os.path.join(self.config.prefix, 'lib')): os.makedirs(os.path.join(self.config.prefix, 'lib')) - for f in ['libstdc++-6', 'libgomp-1', 'libwinpthread-1']: + for f in ['libwinpthread-1']: + shutil.copy( + os.path.join(self.config.toolchain_prefix, 'bin', f + '.dll'), + os.path.join(self.config.prefix, 'bin', f + '.dll')) + for f in ['libgomp-1', 'libstdc++-6']: shutil.copy( os.path.join(self.config.toolchain_prefix, binmingw, f + '.dll'), os.path.join(self.config.prefix, 'bin', f + '.dll')) diff --git a/recipes/orbit2.recipe b/recipes/orbit2.recipe index 7dd898b7..6fb2fbd8 100644 --- a/recipes/orbit2.recipe +++ b/recipes/orbit2.recipe @@ -10,6 +10,7 @@ class Recipe(recipe.Recipe): url = 'http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2' append_env = {'CFLAGS': '-Wno-error'} autoreconf = True + tarball_dirname = 'ORBit2-%(version)s' deps = ['glib', 'libIDL'] |