diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-09-19 13:55:23 +0200 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-09-19 13:55:23 +0200 |
| commit | f8baa184021da5655c24f24b069a76e71b721876 (patch) | |
| tree | 075bd7c23ad8b70c474abc5b085b6d157e5cbd18 | |
| parent | f60cab4d494dffb89894a5aba0695b29872fe0fd (diff) | |
| parent | 1f64da0d4ce5ed89e9484a76f607689cb5355ff4 (diff) | |
Merge branch 'master' into upstream
| -rw-r--r-- | recipes/build-tools/gas-preprocessor.recipe | 6 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-static.recipe | 5 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad.recipe | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/recipes/build-tools/gas-preprocessor.recipe b/recipes/build-tools/gas-preprocessor.recipe index 65f28bb6..1315c4f1 100644 --- a/recipes/build-tools/gas-preprocessor.recipe +++ b/recipes/build-tools/gas-preprocessor.recipe @@ -8,10 +8,12 @@ class Recipe(recipe.Recipe): version = '0.0.0' licenses = [License.GPLv2] btype = BuildType.CUSTOM - remotes = {'origin': 'git://github.com/yuvi/gas-preprocessor.git'} - commit = 'f4a42dc077144c5b481ec4534a4c99d0808a9b2f' + remotes = {'origin': 'git://github.com/ylatuya/gas-preprocessor.git'} + commit = 'origin/master' def install(self): + if not os.path.exists(os.path.join(self.config.prefix, 'bin')): + os.makedirs(os.path.join(self.config.prefix, 'bin')) shutil.copy (os.path.join(self.build_dir, 'gas-preprocessor.pl'), os.path.join(self.config.prefix, 'bin')) shell.call ('chmod +x %s' % diff --git a/recipes/gst-plugins-bad-static.recipe b/recipes/gst-plugins-bad-static.recipe index caea9d16..ca0d82c9 100644 --- a/recipes/gst-plugins-bad-static.recipe +++ b/recipes/gst-plugins-bad-static.recipe @@ -118,7 +118,10 @@ class Recipe(custom.GStreamerStatic): ], Platform.WINDOWS: [ 'libgstwinscreencap', - ] + ], + Platform.DARWIN: [ + 'libgstosxvideosrc', + ] } platform_files_plugins_sys_devel = { diff --git a/recipes/gst-plugins-bad.recipe b/recipes/gst-plugins-bad.recipe index 6ac221f0..e2729a7b 100644 --- a/recipes/gst-plugins-bad.recipe +++ b/recipes/gst-plugins-bad.recipe @@ -131,6 +131,9 @@ class Recipe(recipe.Recipe): ], Platform.WINDOWS: [ 'lib/gstreamer-0.10/libgstwinscreencap%(mext)s', + ], + Platform.DARWIN: [ + 'lib/gstreamer-0.10/libgstosxvideosrc%(mext)s', ] } |