diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 13:13:52 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 14:28:55 +0200 |
| commit | b0d89da6b66021bc8677b9785998b12b6a00676a (patch) | |
| tree | 5e4ce2dffca4125e05d96bf47b1fb17b61cd1217 /gst/gstregistry.c | |
| parent | 6a0e594ebcadbe8d9e32819579072920ef422274 (diff) | |
gst: Change versioning
Remove GST_MAJORMINOR and replace it by GST_API_VERSION
Also set GST_VERSION_{MAJOR,MINOR,MICRO,NANO} explicitely
now.
All versions are at 1.0.0 now for the release soon but
API/ABI can still change until the 1.0.0 release.
Next release versions until 1.0.0 will be 0.10.9X and
these will be release candidates. GST_VERSION_* will
nonetheless stay at 1.0.0.0.
Diffstat (limited to 'gst/gstregistry.c')
| -rw-r--r-- | gst/gstregistry.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gst/gstregistry.c b/gst/gstregistry.c index 59653d013d..6f41dcf856 100644 --- a/gst/gstregistry.c +++ b/gst/gstregistry.c @@ -57,13 +57,13 @@ * <listitem> * <para>default locations (if GST_PLUGIN_SYSTEM_PATH is not set). Those * default locations are: - * <filename>~/.gstreamer-$GST_MAJORMINOR/plugins/</filename> - * and <filename>$prefix/libs/gstreamer-$GST_MAJORMINOR/</filename>. + * <filename>~/.gstreamer-$GST_API_VERSION/plugins/</filename> + * and <filename>$prefix/libs/gstreamer-$GST_API_VERSION/</filename>. * </para> * </listitem> * </itemizedlist> * The registry cache file is loaded from - * <filename>~/.gstreamer-$GST_MAJORMINOR/registry-$ARCH.bin</filename> or the + * <filename>~/.gstreamer-$GST_API_VERSION/registry-$ARCH.bin</filename> or the * file listed in the GST_REGISTRY env var. One reason to change the registry * location is for testing. * @@ -1574,7 +1574,7 @@ scan_and_update_registry (GstRegistry * default_registry, /* plugins in the user's home directory take precedence over * system-installed ones */ home_plugins = g_build_filename (g_get_user_data_dir (), - "gstreamer-" GST_MAJORMINOR, "plugins", NULL); + "gstreamer-" GST_API_VERSION, "plugins", NULL); GST_DEBUG ("scanning home plugins %s", home_plugins); changed |= gst_registry_scan_path_internal (&context, home_plugins); @@ -1656,7 +1656,7 @@ ensure_current_registry (GError ** error) registry_file = g_strdup (g_getenv ("GST_REGISTRY")); if (registry_file == NULL) { registry_file = g_build_filename (g_get_user_cache_dir (), - "gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".bin", NULL); + "gstreamer-" GST_API_VERSION, "registry." HOST_CPU ".bin", NULL); } if (!_gst_disable_registry_cache) { |