From 4b469908a15dc3730e75740c106f3ae89ba51b99 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 30 Sep 2011 17:43:24 +0200 Subject: gstreamer: upgrade to 0.10.35 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer-0.10.32/check_fix.patch | 19 - .../gst-inspect-check-error.patch | 16 - .../gstreamer-0.10.32/gstregistrybinary.c | 487 --------------------- .../gstreamer-0.10.32/gstregistrybinary.h | 194 -------- .../gstreamer/gstreamer-0.10.35/check_fix.patch | 19 + .../gst-inspect-check-error.patch | 16 + .../gstreamer-0.10.35/gstregistrybinary.c | 487 +++++++++++++++++++++ .../gstreamer-0.10.35/gstregistrybinary.h | 194 ++++++++ .../gstreamer/gstreamer_0.10.32.bb | 34 -- .../gstreamer/gstreamer_0.10.35.bb | 32 ++ 10 files changed, 748 insertions(+), 750 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/check_fix.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gst-inspect-check-error.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.c delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.h create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/check_fix.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gst-inspect-check-error.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.c create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.h delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/check_fix.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/check_fix.patch deleted file mode 100644 index 5d8bb13403..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/check_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -# gstreamer: Fix a problem with configure if check has already been built -# Richard Purdie - -Upstream-Status: Inappropriate [configuration] - -diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac ---- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800 -+++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800 -@@ -543,8 +543,10 @@ - *) BUILD_CHECK=yes ;; - esac - ]) -+ - dnl bit of a misnomer, but keep the conditional named like this so we don't - dnl have to change too much elsewhere -+HAVE_CHECK=no - AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes") - - dnl configure the desired buffer alignment diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gst-inspect-check-error.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gst-inspect-check-error.patch deleted file mode 100644 index 30be85f59d..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gst-inspect-check-error.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Fix crash with gst-inspect -# Chris Lord - -Upstream-Status: Pending - ---- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100 -+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100 -@@ -1123,7 +1123,7 @@ - g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); - g_option_context_add_group (ctx, gst_init_get_option_group ()); - if (!g_option_context_parse (ctx, &argc, &argv, &err)) { -- g_print ("Error initializing: %s\n", err->message); -+ g_print ("Error initializing: %s\n", err ? err->message : "(null)"); - exit (1); - } - g_option_context_free (ctx); diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.c b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.c deleted file mode 100644 index c1f3e71af6..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.c +++ /dev/null @@ -1,487 +0,0 @@ -/* GStreamer - * Copyright (C) 1999,2000 Erik Walthinsen - * 2000 Wim Taymans - * 2005 David A. Schleef - * - * gstregistryxml.c: GstRegistry object, support routines - * - * This library is free software; you can redistribute it and/or - * modify it ulnder the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#include - -/* -** Simple handy function to write a memory location to the registry cache file -*/ -inline static gboolean -gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size) -{ - if (write(registry->cache_file, mem, size) != size) - { - GST_ERROR("Failed to write binary registry element: ptr=%p size=%u error=%s\n", - mem, size, strerror(errno)); - return FALSE; - } - return TRUE; -} - -/* -** Save features GstBinary style -*/ -static gboolean -gst_registry_binary_fill_feature(GList **list, GstPluginFeature *orig, GstBinaryPluginFeature *dest, const char *name) -{ - GstBinaryChunck *chk; - - if ((chk = calloc(1, sizeof (GstBinaryChunck))) == NULL) - return FALSE; - - chk->data = dest; - chk->size = sizeof (GstBinaryPluginFeature); - - *list = g_list_append(*list, chk); - - dest->rank = orig->rank; - if (!strncpy(dest->typename, name, GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN) || - !strncpy(dest->name, orig->name, GST_BINARY_REGISTRY_TYPENAME_NAME_LEN)) - { - GST_ERROR("Failed to write binary registry feature"); - goto fail; - } - - if (GST_IS_ELEMENT_FACTORY(orig)) - { - GstElementFactory *factory = GST_ELEMENT_FACTORY(orig); - - if (!strncpy(dest->longname, factory->details.longname, GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN) || - !strncpy(dest->class, factory->details.klass, GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN) || - !strncpy(dest->description, factory->details.description, GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN) || - !strncpy(dest->author, factory->details.author, GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN)) - { - GST_ERROR("Failed to write binary registry feature"); - goto fail; - } - } - - dest->npadtemplates = dest->ninterfaces = dest->nuritypes = 0; - return TRUE; - - fail: - free(chk); - return FALSE; -} - - -/* -** Initialize the GstBinaryRegistryMagic, setting both our magic number and gstreamer major/minor version -*/ -inline static gboolean -gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m) -{ - if (!strncpy(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) || - !strncpy(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN)) - { - GST_ERROR("Failed to write magic to the registry magic structure"); - return FALSE; - } - return TRUE; -} - -/* -** Check GstBinaryRegistryMagic validity. -** Return a pointer pointing right after the magic structure -*/ -static gchar * -gst_registry_binary_check_magic(gchar *in) -{ - GstBinaryRegistryMagic *m = (GstBinaryRegistryMagic *) in; - - if (m == NULL || m->magic == NULL || m->version == NULL) - { - GST_ERROR("Binary registry magic structure is broken"); - return NULL; - } - if (strncmp(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) != 0) - { - GST_ERROR("Binary registry magic is different : %02x%02x%02x%02x != %02x%02x%02x%02x", - GST_MAGIC_BINARY_REGISTRY_STR[0] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[1] & 0xff, - GST_MAGIC_BINARY_REGISTRY_STR[2] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[3] & 0xff, - m->magic[0] & 0xff, m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff); - return NULL; - } - if (strncmp(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN)) - { - GST_ERROR("Binary registry magic version is different : %s != %s", - GST_MAJORMINOR, m->version); - return NULL; - } - return (in + sizeof (GstBinaryRegistryMagic)); -} - -/* -** Adapt a GstPlugin to our GstBinaryPluginElement structure, and write it to the -** registry file. -*/ -static gboolean -gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin) -{ - GstBinaryPluginElement *e; - GstBinaryChunck *chk; - GList *walk; - - if ((e = calloc(1, sizeof (GstBinaryPluginElement))) == NULL || - (chk = calloc(1, sizeof (GstBinaryChunck))) == NULL) - return FALSE; - - chk->data = e; - chk->size = sizeof (GstBinaryPluginElement); - *list = g_list_append(*list, chk); - - if (!strncpy(e->name, plugin->desc.name, GST_BINARY_REGISTRY_NAME_LEN) || - !strncpy(e->description, plugin->desc.description, GST_BINARY_REGISTRY_DESCRIPTION_LEN) || - !strncpy(e->filename, plugin->filename, _POSIX_PATH_MAX) || - !strncpy(e->version, plugin->desc.version, GST_BINARY_REGISTRY_VERSION_LEN) || - !strncpy(e->license, plugin->desc.license, GST_BINARY_REGISTRY_LICENSE_LEN) || - !strncpy(e->source, plugin->desc.source, GST_BINARY_REGISTRY_SOURCE_LEN) || - !strncpy(e->package, plugin->desc.package, GST_BINARY_REGISTRY_PACKAGE_LEN) || - !strncpy(e->origin, plugin->desc.origin, GST_BINARY_REGISTRY_ORIGIN_LEN)) - { - GST_DEBUG("Can't adapt GstPlugin to GstBinaryPluginElement"); - goto fail; - } - - e->size = plugin->file_size; - e->m32p = plugin->file_mtime; - - GList *ft_list = gst_registry_get_feature_list_by_plugin(registry, plugin->desc.name); - - for (walk = ft_list; walk; walk = g_list_next(walk), e->nfeatures++) - { - GstPluginFeature *curfeat = GST_PLUGIN_FEATURE (walk->data); - GstBinaryPluginFeature *newfeat; - const char *feat_name = g_type_name(G_OBJECT_TYPE(curfeat)); - - if ((newfeat = calloc(1, sizeof (GstBinaryPluginFeature))) == NULL) - goto fail; - - if (!feat_name || !gst_registry_binary_fill_feature(list, curfeat, newfeat, feat_name)) - { - GST_ERROR("Can't fill plugin feature, aborting."); - goto fail; - } - } - - GST_DEBUG("Found %d features in plugin \"%s\"\n", e->nfeatures, e->name); - return TRUE; - - fail: - free(chk); - free(e); - return FALSE; -} - -/* -** Write the cache to file. Part of the code was taken from gstregistryxml.c -*/ -gboolean -gst_registry_binary_write_cache(GstRegistry *registry, const char *location) -{ - GList *walk; - char *tmp_location; - GstBinaryRegistryMagic *magic; - GstBinaryChunck *magic_chunck; - GList *to_write = NULL; - - GST_INFO("Writing binary registry cache"); - - g_return_val_if_fail (GST_IS_REGISTRY (registry), FALSE); - tmp_location = g_strconcat (location, ".tmpXXXXXX", NULL); - registry->cache_file = g_mkstemp (tmp_location); - if (registry->cache_file == -1) - { - char *dir; - - /* oops, I bet the directory doesn't exist */ - dir = g_path_get_dirname (location); - g_mkdir_with_parents (dir, 0777); - g_free (dir); - - registry->cache_file = g_mkstemp (tmp_location); - } - - if (registry->cache_file == -1) - goto fail; - - if ((magic = calloc(1, sizeof (GstBinaryRegistryMagic))) == NULL || - !gst_registry_binary_initialize_magic(magic)) - goto fail; - - if ((magic_chunck = calloc(1, sizeof (GstBinaryChunck))) == NULL) - goto fail; - - magic_chunck->data = magic; - magic_chunck->size = sizeof (GstBinaryRegistryMagic); - to_write = g_list_append(to_write, magic_chunck); - - /* Iterate trough the list of plugins in the GstRegistry and adapt them to our structures */ - for (walk = g_list_last(registry->plugins); walk; walk = g_list_previous(walk)) - { - GstPlugin *plugin = GST_PLUGIN(walk->data); - - if (!plugin->filename) - continue; - - if (plugin->flags & GST_PLUGIN_FLAG_CACHED) - { - int ret; - struct stat statbuf; - - ret = g_stat (plugin->filename, &statbuf); - if ((ret = g_stat (plugin->filename, &statbuf)) < 0 || - plugin->file_mtime != statbuf.st_mtime || - plugin->file_size != statbuf.st_size) - continue; - } - - if (!gst_registry_binary_save_plugin(&to_write, registry, plugin)) - { - GST_ERROR("Can't write binary plugin information for \"%s\"", plugin->filename); - continue; /* Try anyway */ - } - } - - for (walk = g_list_first(to_write); walk; walk = g_list_next(walk)) - { - GstBinaryChunck *cur = walk->data; - - if (!gst_registry_binary_write(registry, cur->data, cur->size)) - { - free(cur->data); - free(cur); - g_list_free(to_write); - goto fail; - } - free(cur->data); - free(cur); - } - g_list_free(to_write); - - if (close(registry->cache_file) < 0) - { - GST_DEBUG("Can't close registry file : %s", strerror(errno)); - goto fail; - } - - if (g_file_test (tmp_location, G_FILE_TEST_EXISTS)) { -#ifdef WIN32 - remove (location); -#endif - rename (tmp_location, location); - } - - g_free (tmp_location); - return TRUE; - - fail: - g_free(tmp_location); - return FALSE; -} - -static GstPluginFeature* -gst_registry_binary_load_feature(GstBinaryPluginFeature *in) -{ - GstPluginFeature *feature; - GType type; - - if (!in->typename || !*(in->typename)) - return NULL; - - /* GST_INFO("Plugin feature typename : %s", in->typename);*/ - - if (!(type = g_type_from_name(in->typename))) - { - GST_ERROR("Unknown type from typename"); - return NULL; - } - feature = g_object_new (type, NULL); - - if (!feature) { - GST_ERROR("Can't create feature from type"); - return NULL; - } - - if (!GST_IS_PLUGIN_FEATURE (feature)) { - /* don't really know what it is */ - if (GST_IS_OBJECT (feature)) - gst_object_unref (feature); - else - g_object_unref (feature); - return NULL; - } - - feature->name = g_strdup(in->name); - feature->rank = in->rank; - - if (GST_IS_ELEMENT_FACTORY(feature)) - { - GstElementFactory *factory = GST_ELEMENT_FACTORY(feature); - - factory->details.longname = g_strdup(in->longname); - factory->details.klass = g_strdup(in->class); - factory->details.description = g_strdup(in->description); - factory->details.author = g_strdup(in->author); - - /* GST_INFO("Element factory : %s", factory->details.longname); */ - } - - GST_DEBUG("Added feature %p with name %s", feature, feature->name); - return feature; -} - -/* -** Make a new plugin from current GstBinaryPluginElement structure -** and save it to the GstRegistry. Return an offset to the next -** GstBinaryPluginElement structure. -*/ -static unsigned long -gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in) -{ - GstBinaryPluginElement *p = (GstBinaryPluginElement *) in; - GstPlugin *plugin = NULL; - GList *plugin_features = NULL; - GstBinaryPluginFeature *feat; - unsigned int i; - unsigned long offset; - - plugin = g_object_new (GST_TYPE_PLUGIN, NULL); - - plugin->flags |= GST_PLUGIN_FLAG_CACHED; - - plugin->desc.name = g_strdup(p->name); - plugin->desc.description= g_strdup(p->description); - plugin->filename = g_strdup(p->filename); - plugin->desc.version = g_strdup(p->version); - plugin->desc.license = g_strdup(p->license); - plugin->desc.source = g_strdup(p->source); - plugin->desc.package = g_strdup(p->package); - plugin->desc.origin = g_strdup(p->origin); - plugin->file_mtime = p->m32p; - plugin->file_size = p->size; - plugin->basename = g_path_get_basename (plugin->filename); - - if (plugin->file_mtime < 0 || plugin->file_size < 0) - { - GST_ERROR("Plugin time or file size is not valid !"); - g_free(plugin); - return -1; - } - - if (p->nfeatures < 0) - { - GST_ERROR("The number of feature structure is not valid !"); - gst_object_unref(plugin); - return -1; - } - - for (feat = (GstBinaryPluginFeature *) (in + sizeof (GstBinaryPluginElement)), i = 0; - i < p->nfeatures; i++, feat++) - { - GstPluginFeature *gstfeat; - - if ((gstfeat = gst_registry_binary_load_feature(feat)) == NULL) - { - g_list_free(plugin_features); - g_free(plugin); - GST_ERROR("Error while loading binary feature"); - return -1; - } - gstfeat->plugin_name = g_strdup(plugin->desc.name); - plugin_features = g_list_prepend(plugin_features, gstfeat); - } - - GST_DEBUG("Added plugin \"%s\" to global registry from binary registry", plugin->desc.name); - GList *g; - - gst_registry_add_plugin (registry, plugin); - for (g = plugin_features; g; g = g_list_next (g)) - gst_registry_add_feature (registry, GST_PLUGIN_FEATURE (g->data)); - /* g_list_free(plugin_features); */ - - offset = sizeof (GstBinaryPluginElement) + p->nfeatures * sizeof (GstBinaryPluginFeature); - return offset; -} - - -/* -** Read the cache and adapt it to fill GstRegistry -*/ -gboolean -gst_registry_binary_read_cache(GstRegistry *registry, const char *location) -{ - GMappedFile *mapped = NULL; - GTimer *timer = NULL; - gchar *contents = NULL; - gdouble seconds; - unsigned long offset, inc; - gsize size; - - /* make sure these types exist */ - GST_TYPE_ELEMENT_FACTORY; - GST_TYPE_TYPE_FIND_FACTORY; - GST_TYPE_INDEX_FACTORY; - - timer = g_timer_new (); - - if ((mapped = g_mapped_file_new(location, FALSE, NULL)) == NULL || - (contents = g_mapped_file_get_contents(mapped)) == NULL) - { - GST_ERROR("Can't load file : %s", strerror(errno)); - return FALSE; - } - if ((contents = gst_registry_binary_check_magic(contents)) == NULL) - { - GST_ERROR("Binary registry type not recognized (invalid magic)"); - g_mapped_file_free(mapped); - return FALSE; - } - - if ((size = g_mapped_file_get_length(mapped)) < sizeof (GstBinaryPluginElement)) - { - GST_INFO("No binary plugins structure to read"); - return TRUE; /* This is not really an error */ - } - - for (offset = inc = 0; (offset + sizeof (GstBinaryPluginElement)) < size && - (inc = gst_registry_binary_get_binary_plugin(registry, contents + offset)) > 0; - offset += inc) - ; /* May want in the future to do something here */ - if (inc < 0) - { - GST_DEBUG("Problem while reading binary registry"); - return FALSE; - } - - g_timer_stop (timer); - seconds = g_timer_elapsed (timer, NULL); - g_timer_destroy (timer); - - GST_INFO ("loaded %s in %f seconds", location, seconds); - - if (mapped) - g_mapped_file_free (mapped); - return TRUE; -} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.h b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.h deleted file mode 100644 index 2ef24d765d..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.h +++ /dev/null @@ -1,194 +0,0 @@ -/* GStreamer - * Copyright (C) 1999,2000 Erik Walthinsen - * 2000 Wim Taymans - * - * gstregistry.h: Header for registry handling - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* SUGGESTIONS AND TODO : -** ==================== -** - Use a compressed registry, but would induce performance loss -** - Encrypt the registry, for security purpose, but would also reduce performances -** - Also have a non-mmap based cache reading (work with file descriptors) -*/ - -#ifndef __GST_REGISTRYBINARY_H__ -#define __GST_REGISTRYBINARY_H__ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "glib-compat-private.h" -#include - -/* A magic, written at the beginning of the file */ -#define GST_MAGIC_BINARY_REGISTRY_STR "\xc0\xde\xf0\x0d" -#define GST_MAGIC_BINARY_REGISTRY_LEN (4) -#define GST_MAGIC_BINARY_VERSION_LEN (64) - -typedef struct _GstBinaryRegistryMagic -{ - char magic[GST_MAGIC_BINARY_REGISTRY_LEN]; - char version[GST_MAGIC_BINARY_VERSION_LEN]; -} GstBinaryRegistryMagic; - - -/* Used to store pointers to write */ -typedef struct _GstBinaryChunck -{ - void *data; - unsigned int size; -} GstBinaryChunck; - - -/* A structure containing (staticely) every information needed for a plugin -** -** Notes : -** "nfeatures" is used to say how many GstBinaryPluginFeature structures we will have -** right after the structure itself. -*/ - -/* Various lenght defines for our GstBinaryPluginElement structure -** Note : We could eventually use smaller size -*/ -#define GST_BINARY_REGISTRY_NAME_LEN (256) -#define GST_BINARY_REGISTRY_DESCRIPTION_LEN (1024) -#define GST_BINARY_REGISTRY_VERSION_LEN (64) -#define GST_BINARY_REGISTRY_LICENSE_LEN (256) -#define GST_BINARY_REGISTRY_SOURCE_LEN (256) -#define GST_BINARY_REGISTRY_PACKAGE_LEN (1024) -#define GST_BINARY_REGISTRY_ORIGIN_LEN (1024) - -typedef struct _GstBinaryPluginElement -{ - char name[GST_BINARY_REGISTRY_NAME_LEN]; - char description[GST_BINARY_REGISTRY_DESCRIPTION_LEN]; - char filename[_POSIX_PATH_MAX]; - char version[GST_BINARY_REGISTRY_VERSION_LEN]; - char license[GST_BINARY_REGISTRY_LICENSE_LEN]; - char source[GST_BINARY_REGISTRY_SOURCE_LEN]; - char package[GST_BINARY_REGISTRY_PACKAGE_LEN]; - char origin[GST_BINARY_REGISTRY_ORIGIN_LEN]; - unsigned long size; - unsigned long m32p; - unsigned int nfeatures; -} GstBinaryPluginElement; - - -/* A structure containing the plugin features -** -** Note : -** "npadtemplates" is used to store the number of GstBinaryPadTemplate structures following the structure itself. -** "ninterfaces" is used to store the number of GstBinaryInterface structures following the structure itself. -** "nuritypes" is used to store the number of GstBinaryUriType structures following the structure itself. -*/ -#define GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN (256) -#define GST_BINARY_REGISTRY_TYPENAME_NAME_LEN (256) -#define GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN (1024) -#define GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN (512) -#define GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN (1024) -#define GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN (256) - -typedef struct _GstBinaryPluginFeature -{ - char typename[GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN]; - char name[GST_BINARY_REGISTRY_TYPENAME_NAME_LEN]; - unsigned long rank; - char longname[GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN]; - char class[GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN]; - char description[GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN]; - char author[GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN]; - unsigned int npadtemplates; - unsigned int ninterfaces; - unsigned int nuritypes; -} GstBinaryPluginFeature; - - -/* -** A structure containing the static pad templates of a plugin feature -*/ -#define GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN (256) -#define GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN (1024) - -typedef struct _GstBinaryPadTemplate -{ - char name[GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN]; - char cap[GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN]; - int direction; /* Either 0:"sink" or 1:"src" */ - GstPadPresence presence; -} GstBinaryPadTemplate; - -/* -** A very simple structure defining the plugin feature interface string -*/ -#define GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN (512) -typedef struct _GstBinaryInterface -{ - char interface[GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN]; - unsigned long size; -} GstBinaryInterface; - -/* Uri Type */ -typedef struct _GstBinaryUriType -{ - GstURIType type; - unsigned long nuriprotocols; -} GstBinaryUriType; - -/* -** Function prototypes -*/ - -/* Local prototypes */ -inline static gboolean gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size); -inline static gboolean gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m); -static gboolean gst_registry_binary_fill_feature(GList **list, GstPluginFeature *, GstBinaryPluginFeature *, const char *); -static gboolean gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin); -static gchar *gst_registry_binary_check_magic(gchar *in); -static GstPluginFeature *gst_registry_binary_load_feature(GstBinaryPluginFeature *); -static unsigned long gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in); - -/* Exportable */ -gboolean gst_registry_binary_write_cache(GstRegistry *registry, const char *location); -gboolean gst_registry_binary_read_cache(GstRegistry *registry, const char *location); - -#endif /* !__GST_REGISTRYBINARY_H__ */ - - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/check_fix.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/check_fix.patch new file mode 100644 index 0000000000..5d8bb13403 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/check_fix.patch @@ -0,0 +1,19 @@ +# gstreamer: Fix a problem with configure if check has already been built +# Richard Purdie + +Upstream-Status: Inappropriate [configuration] + +diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac +--- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800 ++++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800 +@@ -543,8 +543,10 @@ + *) BUILD_CHECK=yes ;; + esac + ]) ++ + dnl bit of a misnomer, but keep the conditional named like this so we don't + dnl have to change too much elsewhere ++HAVE_CHECK=no + AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes") + + dnl configure the desired buffer alignment diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gst-inspect-check-error.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gst-inspect-check-error.patch new file mode 100644 index 0000000000..30be85f59d --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gst-inspect-check-error.patch @@ -0,0 +1,16 @@ +# Fix crash with gst-inspect +# Chris Lord + +Upstream-Status: Pending + +--- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100 ++++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100 +@@ -1123,7 +1123,7 @@ + g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); + g_option_context_add_group (ctx, gst_init_get_option_group ()); + if (!g_option_context_parse (ctx, &argc, &argv, &err)) { +- g_print ("Error initializing: %s\n", err->message); ++ g_print ("Error initializing: %s\n", err ? err->message : "(null)"); + exit (1); + } + g_option_context_free (ctx); diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.c b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.c new file mode 100644 index 0000000000..c1f3e71af6 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.c @@ -0,0 +1,487 @@ +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen + * 2000 Wim Taymans + * 2005 David A. Schleef + * + * gstregistryxml.c: GstRegistry object, support routines + * + * This library is free software; you can redistribute it and/or + * modify it ulnder the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + +#include + +/* +** Simple handy function to write a memory location to the registry cache file +*/ +inline static gboolean +gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size) +{ + if (write(registry->cache_file, mem, size) != size) + { + GST_ERROR("Failed to write binary registry element: ptr=%p size=%u error=%s\n", + mem, size, strerror(errno)); + return FALSE; + } + return TRUE; +} + +/* +** Save features GstBinary style +*/ +static gboolean +gst_registry_binary_fill_feature(GList **list, GstPluginFeature *orig, GstBinaryPluginFeature *dest, const char *name) +{ + GstBinaryChunck *chk; + + if ((chk = calloc(1, sizeof (GstBinaryChunck))) == NULL) + return FALSE; + + chk->data = dest; + chk->size = sizeof (GstBinaryPluginFeature); + + *list = g_list_append(*list, chk); + + dest->rank = orig->rank; + if (!strncpy(dest->typename, name, GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN) || + !strncpy(dest->name, orig->name, GST_BINARY_REGISTRY_TYPENAME_NAME_LEN)) + { + GST_ERROR("Failed to write binary registry feature"); + goto fail; + } + + if (GST_IS_ELEMENT_FACTORY(orig)) + { + GstElementFactory *factory = GST_ELEMENT_FACTORY(orig); + + if (!strncpy(dest->longname, factory->details.longname, GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN) || + !strncpy(dest->class, factory->details.klass, GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN) || + !strncpy(dest->description, factory->details.description, GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN) || + !strncpy(dest->author, factory->details.author, GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN)) + { + GST_ERROR("Failed to write binary registry feature"); + goto fail; + } + } + + dest->npadtemplates = dest->ninterfaces = dest->nuritypes = 0; + return TRUE; + + fail: + free(chk); + return FALSE; +} + + +/* +** Initialize the GstBinaryRegistryMagic, setting both our magic number and gstreamer major/minor version +*/ +inline static gboolean +gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m) +{ + if (!strncpy(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) || + !strncpy(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN)) + { + GST_ERROR("Failed to write magic to the registry magic structure"); + return FALSE; + } + return TRUE; +} + +/* +** Check GstBinaryRegistryMagic validity. +** Return a pointer pointing right after the magic structure +*/ +static gchar * +gst_registry_binary_check_magic(gchar *in) +{ + GstBinaryRegistryMagic *m = (GstBinaryRegistryMagic *) in; + + if (m == NULL || m->magic == NULL || m->version == NULL) + { + GST_ERROR("Binary registry magic structure is broken"); + return NULL; + } + if (strncmp(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) != 0) + { + GST_ERROR("Binary registry magic is different : %02x%02x%02x%02x != %02x%02x%02x%02x", + GST_MAGIC_BINARY_REGISTRY_STR[0] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[1] & 0xff, + GST_MAGIC_BINARY_REGISTRY_STR[2] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[3] & 0xff, + m->magic[0] & 0xff, m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff); + return NULL; + } + if (strncmp(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN)) + { + GST_ERROR("Binary registry magic version is different : %s != %s", + GST_MAJORMINOR, m->version); + return NULL; + } + return (in + sizeof (GstBinaryRegistryMagic)); +} + +/* +** Adapt a GstPlugin to our GstBinaryPluginElement structure, and write it to the +** registry file. +*/ +static gboolean +gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin) +{ + GstBinaryPluginElement *e; + GstBinaryChunck *chk; + GList *walk; + + if ((e = calloc(1, sizeof (GstBinaryPluginElement))) == NULL || + (chk = calloc(1, sizeof (GstBinaryChunck))) == NULL) + return FALSE; + + chk->data = e; + chk->size = sizeof (GstBinaryPluginElement); + *list = g_list_append(*list, chk); + + if (!strncpy(e->name, plugin->desc.name, GST_BINARY_REGISTRY_NAME_LEN) || + !strncpy(e->description, plugin->desc.description, GST_BINARY_REGISTRY_DESCRIPTION_LEN) || + !strncpy(e->filename, plugin->filename, _POSIX_PATH_MAX) || + !strncpy(e->version, plugin->desc.version, GST_BINARY_REGISTRY_VERSION_LEN) || + !strncpy(e->license, plugin->desc.license, GST_BINARY_REGISTRY_LICENSE_LEN) || + !strncpy(e->source, plugin->desc.source, GST_BINARY_REGISTRY_SOURCE_LEN) || + !strncpy(e->package, plugin->desc.package, GST_BINARY_REGISTRY_PACKAGE_LEN) || + !strncpy(e->origin, plugin->desc.origin, GST_BINARY_REGISTRY_ORIGIN_LEN)) + { + GST_DEBUG("Can't adapt GstPlugin to GstBinaryPluginElement"); + goto fail; + } + + e->size = plugin->file_size; + e->m32p = plugin->file_mtime; + + GList *ft_list = gst_registry_get_feature_list_by_plugin(registry, plugin->desc.name); + + for (walk = ft_list; walk; walk = g_list_next(walk), e->nfeatures++) + { + GstPluginFeature *curfeat = GST_PLUGIN_FEATURE (walk->data); + GstBinaryPluginFeature *newfeat; + const char *feat_name = g_type_name(G_OBJECT_TYPE(curfeat)); + + if ((newfeat = calloc(1, sizeof (GstBinaryPluginFeature))) == NULL) + goto fail; + + if (!feat_name || !gst_registry_binary_fill_feature(list, curfeat, newfeat, feat_name)) + { + GST_ERROR("Can't fill plugin feature, aborting."); + goto fail; + } + } + + GST_DEBUG("Found %d features in plugin \"%s\"\n", e->nfeatures, e->name); + return TRUE; + + fail: + free(chk); + free(e); + return FALSE; +} + +/* +** Write the cache to file. Part of the code was taken from gstregistryxml.c +*/ +gboolean +gst_registry_binary_write_cache(GstRegistry *registry, const char *location) +{ + GList *walk; + char *tmp_location; + GstBinaryRegistryMagic *magic; + GstBinaryChunck *magic_chunck; + GList *to_write = NULL; + + GST_INFO("Writing binary registry cache"); + + g_return_val_if_fail (GST_IS_REGISTRY (registry), FALSE); + tmp_location = g_strconcat (location, ".tmpXXXXXX", NULL); + registry->cache_file = g_mkstemp (tmp_location); + if (registry->cache_file == -1) + { + char *dir; + + /* oops, I bet the directory doesn't exist */ + dir = g_path_get_dirname (location); + g_mkdir_with_parents (dir, 0777); + g_free (dir); + + registry->cache_file = g_mkstemp (tmp_location); + } + + if (registry->cache_file == -1) + goto fail; + + if ((magic = calloc(1, sizeof (GstBinaryRegistryMagic))) == NULL || + !gst_registry_binary_initialize_magic(magic)) + goto fail; + + if ((magic_chunck = calloc(1, sizeof (GstBinaryChunck))) == NULL) + goto fail; + + magic_chunck->data = magic; + magic_chunck->size = sizeof (GstBinaryRegistryMagic); + to_write = g_list_append(to_write, magic_chunck); + + /* Iterate trough the list of plugins in the GstRegistry and adapt them to our structures */ + for (walk = g_list_last(registry->plugins); walk; walk = g_list_previous(walk)) + { + GstPlugin *plugin = GST_PLUGIN(walk->data); + + if (!plugin->filename) + continue; + + if (plugin->flags & GST_PLUGIN_FLAG_CACHED) + { + int ret; + struct stat statbuf; + + ret = g_stat (plugin->filename, &statbuf); + if ((ret = g_stat (plugin->filename, &statbuf)) < 0 || + plugin->file_mtime != statbuf.st_mtime || + plugin->file_size != statbuf.st_size) + continue; + } + + if (!gst_registry_binary_save_plugin(&to_write, registry, plugin)) + { + GST_ERROR("Can't write binary plugin information for \"%s\"", plugin->filename); + continue; /* Try anyway */ + } + } + + for (walk = g_list_first(to_write); walk; walk = g_list_next(walk)) + { + GstBinaryChunck *cur = walk->data; + + if (!gst_registry_binary_write(registry, cur->data, cur->size)) + { + free(cur->data); + free(cur); + g_list_free(to_write); + goto fail; + } + free(cur->data); + free(cur); + } + g_list_free(to_write); + + if (close(registry->cache_file) < 0) + { + GST_DEBUG("Can't close registry file : %s", strerror(errno)); + goto fail; + } + + if (g_file_test (tmp_location, G_FILE_TEST_EXISTS)) { +#ifdef WIN32 + remove (location); +#endif + rename (tmp_location, location); + } + + g_free (tmp_location); + return TRUE; + + fail: + g_free(tmp_location); + return FALSE; +} + +static GstPluginFeature* +gst_registry_binary_load_feature(GstBinaryPluginFeature *in) +{ + GstPluginFeature *feature; + GType type; + + if (!in->typename || !*(in->typename)) + return NULL; + + /* GST_INFO("Plugin feature typename : %s", in->typename);*/ + + if (!(type = g_type_from_name(in->typename))) + { + GST_ERROR("Unknown type from typename"); + return NULL; + } + feature = g_object_new (type, NULL); + + if (!feature) { + GST_ERROR("Can't create feature from type"); + return NULL; + } + + if (!GST_IS_PLUGIN_FEATURE (feature)) { + /* don't really know what it is */ + if (GST_IS_OBJECT (feature)) + gst_object_unref (feature); + else + g_object_unref (feature); + return NULL; + } + + feature->name = g_strdup(in->name); + feature->rank = in->rank; + + if (GST_IS_ELEMENT_FACTORY(feature)) + { + GstElementFactory *factory = GST_ELEMENT_FACTORY(feature); + + factory->details.longname = g_strdup(in->longname); + factory->details.klass = g_strdup(in->class); + factory->details.description = g_strdup(in->description); + factory->details.author = g_strdup(in->author); + + /* GST_INFO("Element factory : %s", factory->details.longname); */ + } + + GST_DEBUG("Added feature %p with name %s", feature, feature->name); + return feature; +} + +/* +** Make a new plugin from current GstBinaryPluginElement structure +** and save it to the GstRegistry. Return an offset to the next +** GstBinaryPluginElement structure. +*/ +static unsigned long +gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in) +{ + GstBinaryPluginElement *p = (GstBinaryPluginElement *) in; + GstPlugin *plugin = NULL; + GList *plugin_features = NULL; + GstBinaryPluginFeature *feat; + unsigned int i; + unsigned long offset; + + plugin = g_object_new (GST_TYPE_PLUGIN, NULL); + + plugin->flags |= GST_PLUGIN_FLAG_CACHED; + + plugin->desc.name = g_strdup(p->name); + plugin->desc.description= g_strdup(p->description); + plugin->filename = g_strdup(p->filename); + plugin->desc.version = g_strdup(p->version); + plugin->desc.license = g_strdup(p->license); + plugin->desc.source = g_strdup(p->source); + plugin->desc.package = g_strdup(p->package); + plugin->desc.origin = g_strdup(p->origin); + plugin->file_mtime = p->m32p; + plugin->file_size = p->size; + plugin->basename = g_path_get_basename (plugin->filename); + + if (plugin->file_mtime < 0 || plugin->file_size < 0) + { + GST_ERROR("Plugin time or file size is not valid !"); + g_free(plugin); + return -1; + } + + if (p->nfeatures < 0) + { + GST_ERROR("The number of feature structure is not valid !"); + gst_object_unref(plugin); + return -1; + } + + for (feat = (GstBinaryPluginFeature *) (in + sizeof (GstBinaryPluginElement)), i = 0; + i < p->nfeatures; i++, feat++) + { + GstPluginFeature *gstfeat; + + if ((gstfeat = gst_registry_binary_load_feature(feat)) == NULL) + { + g_list_free(plugin_features); + g_free(plugin); + GST_ERROR("Error while loading binary feature"); + return -1; + } + gstfeat->plugin_name = g_strdup(plugin->desc.name); + plugin_features = g_list_prepend(plugin_features, gstfeat); + } + + GST_DEBUG("Added plugin \"%s\" to global registry from binary registry", plugin->desc.name); + GList *g; + + gst_registry_add_plugin (registry, plugin); + for (g = plugin_features; g; g = g_list_next (g)) + gst_registry_add_feature (registry, GST_PLUGIN_FEATURE (g->data)); + /* g_list_free(plugin_features); */ + + offset = sizeof (GstBinaryPluginElement) + p->nfeatures * sizeof (GstBinaryPluginFeature); + return offset; +} + + +/* +** Read the cache and adapt it to fill GstRegistry +*/ +gboolean +gst_registry_binary_read_cache(GstRegistry *registry, const char *location) +{ + GMappedFile *mapped = NULL; + GTimer *timer = NULL; + gchar *contents = NULL; + gdouble seconds; + unsigned long offset, inc; + gsize size; + + /* make sure these types exist */ + GST_TYPE_ELEMENT_FACTORY; + GST_TYPE_TYPE_FIND_FACTORY; + GST_TYPE_INDEX_FACTORY; + + timer = g_timer_new (); + + if ((mapped = g_mapped_file_new(location, FALSE, NULL)) == NULL || + (contents = g_mapped_file_get_contents(mapped)) == NULL) + { + GST_ERROR("Can't load file : %s", strerror(errno)); + return FALSE; + } + if ((contents = gst_registry_binary_check_magic(contents)) == NULL) + { + GST_ERROR("Binary registry type not recognized (invalid magic)"); + g_mapped_file_free(mapped); + return FALSE; + } + + if ((size = g_mapped_file_get_length(mapped)) < sizeof (GstBinaryPluginElement)) + { + GST_INFO("No binary plugins structure to read"); + return TRUE; /* This is not really an error */ + } + + for (offset = inc = 0; (offset + sizeof (GstBinaryPluginElement)) < size && + (inc = gst_registry_binary_get_binary_plugin(registry, contents + offset)) > 0; + offset += inc) + ; /* May want in the future to do something here */ + if (inc < 0) + { + GST_DEBUG("Problem while reading binary registry"); + return FALSE; + } + + g_timer_stop (timer); + seconds = g_timer_elapsed (timer, NULL); + g_timer_destroy (timer); + + GST_INFO ("loaded %s in %f seconds", location, seconds); + + if (mapped) + g_mapped_file_free (mapped); + return TRUE; +} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.h b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.h new file mode 100644 index 0000000000..2ef24d765d --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.h @@ -0,0 +1,194 @@ +/* GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen + * 2000 Wim Taymans + * + * gstregistry.h: Header for registry handling + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* SUGGESTIONS AND TODO : +** ==================== +** - Use a compressed registry, but would induce performance loss +** - Encrypt the registry, for security purpose, but would also reduce performances +** - Also have a non-mmap based cache reading (work with file descriptors) +*/ + +#ifndef __GST_REGISTRYBINARY_H__ +#define __GST_REGISTRYBINARY_H__ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#ifdef HAVE_UNISTD_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "glib-compat-private.h" +#include + +/* A magic, written at the beginning of the file */ +#define GST_MAGIC_BINARY_REGISTRY_STR "\xc0\xde\xf0\x0d" +#define GST_MAGIC_BINARY_REGISTRY_LEN (4) +#define GST_MAGIC_BINARY_VERSION_LEN (64) + +typedef struct _GstBinaryRegistryMagic +{ + char magic[GST_MAGIC_BINARY_REGISTRY_LEN]; + char version[GST_MAGIC_BINARY_VERSION_LEN]; +} GstBinaryRegistryMagic; + + +/* Used to store pointers to write */ +typedef struct _GstBinaryChunck +{ + void *data; + unsigned int size; +} GstBinaryChunck; + + +/* A structure containing (staticely) every information needed for a plugin +** +** Notes : +** "nfeatures" is used to say how many GstBinaryPluginFeature structures we will have +** right after the structure itself. +*/ + +/* Various lenght defines for our GstBinaryPluginElement structure +** Note : We could eventually use smaller size +*/ +#define GST_BINARY_REGISTRY_NAME_LEN (256) +#define GST_BINARY_REGISTRY_DESCRIPTION_LEN (1024) +#define GST_BINARY_REGISTRY_VERSION_LEN (64) +#define GST_BINARY_REGISTRY_LICENSE_LEN (256) +#define GST_BINARY_REGISTRY_SOURCE_LEN (256) +#define GST_BINARY_REGISTRY_PACKAGE_LEN (1024) +#define GST_BINARY_REGISTRY_ORIGIN_LEN (1024) + +typedef struct _GstBinaryPluginElement +{ + char name[GST_BINARY_REGISTRY_NAME_LEN]; + char description[GST_BINARY_REGISTRY_DESCRIPTION_LEN]; + char filename[_POSIX_PATH_MAX]; + char version[GST_BINARY_REGISTRY_VERSION_LEN]; + char license[GST_BINARY_REGISTRY_LICENSE_LEN]; + char source[GST_BINARY_REGISTRY_SOURCE_LEN]; + char package[GST_BINARY_REGISTRY_PACKAGE_LEN]; + char origin[GST_BINARY_REGISTRY_ORIGIN_LEN]; + unsigned long size; + unsigned long m32p; + unsigned int nfeatures; +} GstBinaryPluginElement; + + +/* A structure containing the plugin features +** +** Note : +** "npadtemplates" is used to store the number of GstBinaryPadTemplate structures following the structure itself. +** "ninterfaces" is used to store the number of GstBinaryInterface structures following the structure itself. +** "nuritypes" is used to store the number of GstBinaryUriType structures following the structure itself. +*/ +#define GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN (256) +#define GST_BINARY_REGISTRY_TYPENAME_NAME_LEN (256) +#define GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN (1024) +#define GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN (512) +#define GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN (1024) +#define GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN (256) + +typedef struct _GstBinaryPluginFeature +{ + char typename[GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN]; + char name[GST_BINARY_REGISTRY_TYPENAME_NAME_LEN]; + unsigned long rank; + char longname[GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN]; + char class[GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN]; + char description[GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN]; + char author[GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN]; + unsigned int npadtemplates; + unsigned int ninterfaces; + unsigned int nuritypes; +} GstBinaryPluginFeature; + + +/* +** A structure containing the static pad templates of a plugin feature +*/ +#define GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN (256) +#define GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN (1024) + +typedef struct _GstBinaryPadTemplate +{ + char name[GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN]; + char cap[GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN]; + int direction; /* Either 0:"sink" or 1:"src" */ + GstPadPresence presence; +} GstBinaryPadTemplate; + +/* +** A very simple structure defining the plugin feature interface string +*/ +#define GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN (512) +typedef struct _GstBinaryInterface +{ + char interface[GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN]; + unsigned long size; +} GstBinaryInterface; + +/* Uri Type */ +typedef struct _GstBinaryUriType +{ + GstURIType type; + unsigned long nuriprotocols; +} GstBinaryUriType; + +/* +** Function prototypes +*/ + +/* Local prototypes */ +inline static gboolean gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size); +inline static gboolean gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m); +static gboolean gst_registry_binary_fill_feature(GList **list, GstPluginFeature *, GstBinaryPluginFeature *, const char *); +static gboolean gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin); +static gchar *gst_registry_binary_check_magic(gchar *in); +static GstPluginFeature *gst_registry_binary_load_feature(GstBinaryPluginFeature *); +static unsigned long gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in); + +/* Exportable */ +gboolean gst_registry_binary_write_cache(GstRegistry *registry, const char *location); +gboolean gst_registry_binary_read_cache(GstRegistry *registry, const char *location); + +#endif /* !__GST_REGISTRYBINARY_H__ */ + + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb deleted file mode 100644 index 1713755f1f..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "GStreamer multimedia framework" -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -HOMEPAGE = "http://gstreamer.freedesktop.org/" -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" -SECTION = "multimedia" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ - file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" -DEPENDS = "glib-2.0 libxml2 bison-native flex-native" - -PR = "r1" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ - file://check_fix.patch \ - file://gst-inspect-check-error.patch" - -SRC_URI[md5sum] = "442bc3d37b8511a73379143e7531d726" -SRC_URI[sha256sum] = "3bf4e46a186ee9a1f5e212aaf651d67cffb4f5f05345a7c99ae71d5d992be133" - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" - -#do_compile_prepend () { -# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ -#} - -RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" -FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb new file mode 100644 index 0000000000..50916e52eb --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb @@ -0,0 +1,32 @@ +SUMMARY = "GStreamer multimedia framework" +DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ +It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ + file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" +DEPENDS = "glib-2.0 libxml2 bison-native flex-native" + +SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ + file://check_fix.patch \ + file://gst-inspect-check-error.patch" + +SRC_URI[md5sum] = "4a0a00edad7a2c83de5211ca679dfaf9" +SRC_URI[sha256sum] = "817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" + +#do_compile_prepend () { +# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ +#} + +RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + +FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/" -- cgit v1.2.3