diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-04-15 14:44:11 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-04-15 15:17:48 +0200 |
| commit | 6f1d49bd46b1ae5173a92381ef75fee2c5ba91b5 (patch) | |
| tree | d5f33d764fb16d8a9b778e26f2073222f35a4bba /cerbero | |
| parent | 7cbe9e8fdb5e9eb1399c27e78554af90ee55a52b (diff) | |
cerbero: Set paths for the registry and plugin scanner for 1.0 too
Diffstat (limited to 'cerbero')
| -rw-r--r-- | cerbero/commands/gensdkshell.py | 3 | ||||
| -rw-r--r-- | cerbero/config.py | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cerbero/commands/gensdkshell.py b/cerbero/commands/gensdkshell.py index 20093c2..6cc725d 100644 --- a/cerbero/commands/gensdkshell.py +++ b/cerbero/commands/gensdkshell.py @@ -78,8 +78,11 @@ class GenSdkShell(Command): env['XDG_CONFIG_DIRS'] = \ '%s/etc/xdg${XDG_CONFIG_DIRS:+:$XDG_CONFIG_DIRS}:/etc/xdg' % prefix_env env['GST_REGISTRY'] = '${HOME}/.gstreamer-0.10/gstreamer-sdk-registry' + env['GST_REGISTRY_1_0'] = '${HOME}/.cache/gstreamer-1.0/gstreamer-sdk-registry' env['GST_PLUGIN_SCANNER'] = \ '%s/libexec/gstreamer-0.10/gst-plugin-scanner' % prefix_env + env['GST_PLUGIN_SCANNER_1_0'] = \ + '%s/libexec/gstreamer-1.0/gst-plugin-scanner' % prefix_env env['PYTHONPATH'] = '%s/%s/site-packages${PYTHONPATH:+:$PYTHONPATH}'\ % (prefix_env, py_prefix) env['CFLAGS'] = '-I%s/include ${CFLAGS}' % prefix_env diff --git a/cerbero/config.py b/cerbero/config.py index 48be783..310ffa7 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -187,8 +187,11 @@ class Config (object): [to_unixpath(os.path.join(libdir, 'perl5')), to_unixpath(perlversionpath)]) gstpluginpath = os.path.join(libdir, 'gstreamer-0.10') + gstpluginpath10 = os.path.join(libdir, 'gstreamer-1.0') gstregistry = os.path.join('~', '.gstreamer-0.10', - '.cerbero-registry-%s' % self.target_arch) + 'cerbero-registry-%s' % self.target_arch) + gstregistry10 = os.path.join('~', '.cache', 'gstreamer-1.0', + 'cerbero-registry-%s' % self.target_arch) gstregistry = os.path.expanduser(gstregistry) pythonpath = os.path.join(prefix, py_prefix, 'site-packages') @@ -229,7 +232,9 @@ class Config (object): 'ACLOCAL': aclocal, 'PERL5LIB': perl5lib, 'GST_PLUGIN_PATH': gstpluginpath, + 'GST_PLUGIN_PATH_1_0': gstpluginpath10, 'GST_REGISTRY': gstregistry, + 'GST_REGISTRY_1_0': gstregistry10, 'PYTHONPATH': pythonpath, 'MONO_PATH': os.path.join(libdir, 'mono', '4.5'), 'MONO_GAC_PREFIX': prefix, |