rpms/gstreamer1
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to gst-inspect to generate RPM provides

Browse Source 
Add RPM find-provides script
This commit is contained in:
Brian Pepple 2012-09-09 17:43:29 -04:00
parent 8a6728e9de
commit d41685508d
4 changed files with 439 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

374
gstreamer-inspect-rpm-format.patch Normal file
View File

@ -0,0 +1,374 @@
diff -urp gstreamer-0.11.93.orig/tools/gst-inspect.c gstreamer-0.11.93/tools/gst-inspect.c
--- gstreamer-0.11.93.orig/tools/gst-inspect.c 2012-09-08 16:34:33.450117749 -0400
+++ gstreamer-0.11.93/tools/gst-inspect.c 2012-09-08 16:35:02.710751889 -0400
@@ -1350,9 +1350,225 @@ print_element_info (GstElementFactory *
return 0;
}
+static void
+print_gst_structure_append_field (GList * strings, const char *field)
+{
+ GList *s;
+
+ //g_message ("adding '%s' to the string", field);
+
+ for (s = strings; s != NULL; s = s->next) {
+ g_string_append (s->data, field);
+ }
+}
+
+static void
+print_gst_structure_append_field_index (GList * strings, const char *field,
+ guint num_items, guint offset)
+{
+ GList *s;
+ guint i;
+
+ //g_message ("adding '%s' to the string (num: %d offset: %d)", field, num_items, offset);
+
+ for (s = strings, i = 0; s != NULL; s = s->next, i++) {
+ if (i == offset) {
+ //g_message ("adding '%s' at '%d'", field, i);
+ g_string_append (s->data, field);
+ }
+ if (i == num_items)
+ i = 0;
+ }
+
+}
+
+static GList *
+print_gst_structure_dup_fields (GList * strings, guint num_items)
+{
+ guint new_items, i;
+
+ if (num_items == 1)
+ return strings;
+
+ //g_message ("creating %d new items", num_items);
+
+ new_items = g_list_length (strings) * (num_items - 1);
+ for (i = 0; i < new_items; i++) {
+ GString *s, *first;
+
+ first = strings->data;
+ s = g_string_new_len (first->str, first->len);
+ strings = g_list_prepend (strings, s);
+ }
+
+ return strings;
+}
+
+enum
+{
+ FIELD_VERSION = 0,
+ FIELD_LAYER,
+ FIELD_VARIANT,
+ FIELD_SYSTEMSTREAM
+};
+
+static int
+field_get_type (const char *field_name)
+{
+ if (strstr (field_name, "version") != NULL)
+ return FIELD_VERSION;
+ if (strcmp (field_name, "layer") == 0)
+ return FIELD_LAYER;
+ if (strcmp (field_name, "systemstream") == 0)
+ return FIELD_SYSTEMSTREAM;
+ if (strcmp (field_name, "variant") == 0)
+ return FIELD_VARIANT;
+
+ return -1;
+}
+
+static gint
+fields_type_compare (const char *a, const char *b)
+{
+ gint a_type, b_type;
+
+ a_type = field_get_type (a);
+ b_type = field_get_type (b);
+ if (a_type < b_type)
+ return -1;
+ if (b_type < a_type)
+ return 1;
+ return 0;
+}
static void
-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+print_gst_structure_for_rpm (const char *type_name, GstStructure * s)
+{
+ guint i, num_fields;
+ const char *name;
+ GList *fields, *l, *strings;
+ GString *string;
+
+ name = gst_structure_get_name (s);
+ strings = NULL;
+ num_fields = gst_structure_n_fields (s);
+ fields = NULL;
+
+ for (i = 0; i < num_fields; i++) {
+ const char *field_name;
+
+ field_name = gst_structure_nth_field_name (s, i);
+ if (field_get_type (field_name) < 0) {
+ //g_message ("ignoring field named %s", field_name);
+ continue;
+ }
+
+ fields =
+ g_list_insert_sorted (fields, g_strdup (field_name),
+ (GCompareFunc) fields_type_compare);
+ }
+
+ /* Example:
+ * gstreamer1(decoder-video/mpeg)(mpegversion=1)()(64bit) */
+ string = g_string_new ("gstreamer1");
+ g_string_append_c (string, '(');
+ g_string_append (string, type_name);
+ g_string_append_c (string, '-');
+ g_string_append (string, name);
+ g_string_append_c (string, ')');
+
+ strings = g_list_append (strings, string);
+
+ for (l = fields; l != NULL; l = l->next) {
+ char *field_name;
+ GType type;
+
+ field_name = l->data;
+
+ type = gst_structure_get_field_type (s, field_name);
+ //g_message ("field is: %s, type: %s", field_name, g_type_name (type));
+
+ if (type == G_TYPE_INT) {
+ char *field;
+ int value;
+
+ gst_structure_get_int (s, field_name, &value);
+ field = g_strdup_printf ("(%s=%d)", field_name, value);
+ print_gst_structure_append_field (strings, field);
+ g_free (field);
+ } else if (type == G_TYPE_BOOLEAN) {
+ char *field;
+ int value;
+
+ gst_structure_get_boolean (s, field_name, &value);
+ field = g_strdup_printf ("(%s=%s)", field_name, value ? "true" : "false");
+ print_gst_structure_append_field (strings, field);
+ g_free (field);
+ } else if (type == GST_TYPE_INT_RANGE) {
+ const GValue *value;
+ int min, max;
+
+ value = gst_structure_get_value (s, field_name);
+ min = gst_value_get_int_range_min (value);
+ max = gst_value_get_int_range_max (value);
+
+ strings = print_gst_structure_dup_fields (strings, max - min + 1);
+
+ for (i = min; i <= max; i++) {
+ char *field;
+
+ field = g_strdup_printf ("(%s=%d)", field_name, i);
+ print_gst_structure_append_field_index (strings, field, max - min + 1,
+ i - min);
+ g_free (field);
+ }
+ } else if (type == GST_TYPE_LIST) {
+ const GValue *value;
+ int num_items;
+
+ value = gst_structure_get_value (s, field_name);
+ num_items = gst_value_list_get_size (value);
+
+ strings = print_gst_structure_dup_fields (strings, num_items);
+
+ for (i = 0; i < num_items; i++) {
+ char *field;
+ const GValue *item_value;
+
+ item_value = gst_value_list_get_value (value, i);
+ field = g_strdup_printf ("(%s=%d)", field_name,
+ g_value_get_int (item_value));
+ print_gst_structure_append_field_index (strings, field, num_items, i);
+ g_free (field);
+ }
+ } else if (type == G_TYPE_STRING) {
+ char *field;
+ const char *value;
+
+ value = gst_structure_get_string (s, field_name);
+ field = g_strdup_printf ("(%s=%s)", field_name, value);
+ print_gst_structure_append_field (strings, field);
+ g_free (field);
+ } else {
+ g_warning ("unhandled type! %s", g_type_name (type));
+ }
+
+ g_free (field_name);
+ }
+
+ g_list_free (fields);
+
+ for (l = strings; l != NULL; l = l->next) {
+ string = l->data;
+ g_print ("%s\n", string->str);
+ g_string_free (string, TRUE);
+ }
+ g_list_free (strings);
+}
+
+static void
+print_plugin_automatic_install_info_codecs (GstElementFactory * factory,
+ gboolean rpm_format)
{
GstPadDirection direction;
const gchar *type_name;
@@ -1377,6 +1593,12 @@ print_plugin_automatic_install_info_code
return;
}
+ if (rpm_format) {
+ /* Ignore NONE ranked plugins */
+ if ((gst_plugin_feature_get_rank (GST_PLUGIN_FEATURE (factory))) == GST_RANK_NONE)
+ return;
+ }
+
/* decoder/demuxer sink pads should always be static and there should only
* be one, the same applies to encoders/muxers and source pads */
static_templates = gst_element_factory_get_static_pad_templates (factory);
@@ -1413,15 +1635,20 @@ print_plugin_automatic_install_info_code
gst_structure_remove_field (s, "rate");
gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "clock-rate");
- s_str = gst_structure_to_string (s);
- g_print ("%s-%s\n", type_name, s_str);
- g_free (s_str);
+ if (!rpm_format) {
+ s_str = gst_structure_to_string (s);
+ g_print ("%s-%s\n", type_name, s_str);
+ g_free (s_str);
+ } else {
+ print_gst_structure_for_rpm (type_name, s);
+ }
}
gst_caps_unref (caps);
}
static void
-print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
+print_plugin_automatic_install_info_protocols (GstElementFactory * factory,
+ gboolean rpm_format)
{
const gchar *const *protocols;
@@ -1430,13 +1657,19 @@ print_plugin_automatic_install_info_prot
switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK:
while (*protocols != NULL) {
- g_print ("urisink-%s\n", *protocols);
+ if (!rpm_format)
+ g_print ("urisink-%s\n", *protocols);
+ else
+ g_print ("gstreamer1(urisink-%s)\n", *protocols);
++protocols;
}
break;
case GST_URI_SRC:
while (*protocols != NULL) {
- g_print ("urisource-%s\n", *protocols);
+ if (!rpm_format)
+ g_print ("urisource-%s\n", *protocols);
+ else
+ g_print ("gstreamer1(urisource-%s)\n", *protocols);
++protocols;
}
break;
@@ -1447,7 +1680,7 @@ print_plugin_automatic_install_info_prot
}
static void
-print_plugin_automatic_install_info (GstPlugin * plugin)
+print_plugin_automatic_install_info (GstPlugin * plugin, gboolean rpm_format)
{
GList *features, *l;
@@ -1466,11 +1699,15 @@ print_plugin_automatic_install_info (Gst
if (feature_plugin == plugin) {
GstElementFactory *factory;
- g_print ("element-%s\n", gst_plugin_feature_get_name (feature));
+ if (!rpm_format)
+ g_print ("element-%s\n", gst_plugin_feature_get_name (feature));
+ else
+ g_print ("gstreamer1(element-%s)\n",
+ gst_plugin_feature_get_name (feature));
factory = GST_ELEMENT_FACTORY (feature);
- print_plugin_automatic_install_info_protocols (factory);
- print_plugin_automatic_install_info_codecs (factory);
+ print_plugin_automatic_install_info_protocols (factory, rpm_format);
+ print_plugin_automatic_install_info_codecs (factory, rpm_format);
}
if (feature_plugin)
gst_object_unref (feature_plugin);
@@ -1492,7 +1729,7 @@ print_all_plugin_automatic_install_info
plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins);
- print_plugin_automatic_install_info (plugin);
+ print_plugin_automatic_install_info (plugin, FALSE);
}
gst_plugin_list_free (orig_plugins);
}
@@ -1504,6 +1741,7 @@ main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
+ gboolean print_aii_rpm = FALSE;
gboolean uri_handlers = FALSE;
#ifndef GST_DISABLE_OPTION_PARSING
GOptionEntry options[] = {
@@ -1516,6 +1754,9 @@ main (int argc, char *argv[])
"or all plugins provide.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
+ {"rpm", '\0', 0, G_OPTION_ARG_NONE, &print_aii_rpm,
+ N_("Print the machine-parsable list of features of a plugin in RPM "
+ "Provides compatible-format"), NULL},
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL},
{"uri-handlers", 'u', 0, G_OPTION_ARG_NONE, &uri_handlers,
@@ -1602,7 +1843,7 @@ main (int argc, char *argv[])
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
- print_plugin_automatic_install_info (plugin);
+ print_plugin_automatic_install_info (plugin, print_aii_rpm);
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
@@ -1615,13 +1856,17 @@ main (int argc, char *argv[])
if (plugin) {
if (print_aii) {
- print_plugin_automatic_install_info (plugin);
+ print_plugin_automatic_install_info (plugin, print_aii_rpm);
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
}
} else {
- g_print (_("Could not load plugin file: %s\n"), error->message);
+ if (!print_aii_rpm)
+ g_print (_("Could not load plugin file: %s\n"), error->message);
+ else
+ g_printerr (_("Could not load plugin file: %s\n"),
+ error->message);
g_error_free (error);
return -1;
}

2
gstreamer1.attr Normal file
View File

@ -0,0 +1,2 @@
%__gstreamer_provides %{_rpmconfigdir}/gstreamer1.prov
%__gstreamer_path ^%{_libdir}/gstreamer-1.*/.*\.so$

44
gstreamer1.prov Normal file
View File

@ -0,0 +1,44 @@
#!/bin/sh
#
# Script to install in:
# /usr/lib/rpm/redhat/find-provides.d
#
# Transform GStreamer auto install info into RPM provides
#
# Author: Bastien Nocera <hadess@hadess.net>
# Based on other provides scripts from RPM
#
filelist=`grep -e '.so$' | sed "s/['\"]/\\\&/g"`
# --- Alpha does not mark 64bit dependencies•
case `uname -m` in
alpha*) mark64="" ;;
*) mark64="()(64bit)" ;;
esac
solist=$(echo $filelist | grep "libgst" | \
xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1 )
function getmark()
{
lib64=`if file -L $1 2>/dev/null | \
grep "ELF 64-bit" >/dev/null; then echo -n "$mark64"; fi`
}
function libdir()
{
buildlibdir=`dirname $1`
buildlibdir=`dirname $buildlibdir`
}
for so in $solist ; do
getmark $so
libdir $so
LD_LIBRARY_PATH=$buildlibdir gst-inspect-1.0 --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
echo -n "$line";
echo -n "$lib64"
echo
done
done

24
gstreamer1.spec
View File

@ -6,13 +6,16 @@
Name: gstreamer1
Version: 0.11.93
Release: 1%{?dist}
Release: 2%{?dist}
Summary: GStreamer streaming media framework runtime
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz
## TODO: Create new patch for rpm provides.
## For GStreamer RPM provides
Patch0: gstreamer-inspect-rpm-format.patch
Source1: gstreamer1.prov
Source2: gstreamer1.attr
BuildRequires: glib2-devel >= %{_glib2}
BuildRequires: libxml2-devel >= %{_libxml2}
@ -77,6 +80,7 @@ GStreamer streaming media framework.
%prep
%setup -q -n gstreamer-%{version}
%patch0 -p1 -b .rpm-provides
%build
@ -92,7 +96,7 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove rpath.
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstbase-1.0.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstcheck-1.0.so.0.0.0
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstcontroller-1.0.so.0.0.0
@ -104,10 +108,13 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-launch-1.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-typefind-1.0
%find_lang gstreamer-%{majorminor}
# Clean out files that should not be part of the rpm.
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
# Add the provides script
install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/gstreamer1.prov
# Add the gstreamer plugin file attribute entry (rpm >= 4.9.0)
install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer1.attr
%post -p /sbin/ldconfig
@ -138,6 +145,9 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
%{_bindir}/gst-launch-%{majorminor}
%{_bindir}/gst-typefind-%{majorminor}
%{_rpmconfigdir}/gstreamer1.prov
%{_rpmconfigdir}/fileattrs/gstreamer1.attr
%doc %{_mandir}/man1/gst-inspect-%{majorminor}.*
%doc %{_mandir}/man1/gst-launch-%{majorminor}.*
%doc %{_mandir}/man1/gst-typefind-%{majorminor}.*
@ -183,6 +193,10 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
%changelog
* Sat Sep 8 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.11.93-2
- Add patch to gst-inspect to generate RPM provides
- Add RPM find-provides script
* Tue Aug 14 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.11.93-1
- Update to 0.11.93.
- Bump minimum version of glib2 needed.