Update to 1.7.1

- update rpm inspect patch
- add gst-stats
- add core traces
This commit is contained in:
Wim Taymans 2016-01-04 11:58:34 +01:00
parent 12d1a83156
commit 969b117377
4 changed files with 47 additions and 23 deletions

1
.gitignore vendored
View File

@ -33,3 +33,4 @@
/gstreamer-1.6.0.tar.xz /gstreamer-1.6.0.tar.xz
/gstreamer-1.6.1.tar.xz /gstreamer-1.6.1.tar.xz
/gstreamer-1.6.2.tar.xz /gstreamer-1.6.2.tar.xz
/gstreamer-1.7.1.tar.xz

View File

@ -1,7 +1,17 @@
diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst-inspect.c From 8dfeddab12777e90f8739f9dab33c62657465854 Mon Sep 17 00:00:00 2001
--- gstreamer-0.11.94.orig/tools/gst-inspect.c 2012-09-01 18:02:10.000000000 -0400 From: Wim Taymans <wtaymans@redhat.com>
+++ gstreamer-0.11.94/tools/gst-inspect.c 2012-09-14 08:04:52.690369047 -0400 Date: Mon, 4 Jan 2016 11:39:33 +0100
@@ -1350,9 +1350,225 @@ print_element_info (GstElementFactory * Subject: [PATCH] inspect: Add RPM output format
---
tools/gst-inspect.c | 276 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 261 insertions(+), 15 deletions(-)
diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 845f52e..9084949 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -1302,9 +1302,225 @@ print_element_info (GstElementFactory * factory, gboolean print_names)
return 0; return 0;
} }
@ -16,8 +26,9 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
+ g_string_append (s->data, field); + g_string_append (s->data, field);
+ } + }
+} +}
+
+static void static void
-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+print_gst_structure_append_field_index (GList * strings, const char *field, +print_gst_structure_append_field_index (GList * strings, const char *field,
+ guint num_items, guint offset) + guint num_items, guint offset)
+{ +{
@ -220,28 +231,28 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
+ } + }
+ g_list_free (strings); + g_list_free (strings);
+} +}
+
static void +static void
-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+print_plugin_automatic_install_info_codecs (GstElementFactory * factory, +print_plugin_automatic_install_info_codecs (GstElementFactory * factory,
+ gboolean rpm_format) + gboolean rpm_format)
{ {
GstPadDirection direction; GstPadDirection direction;
const gchar *type_name; const gchar *type_name;
@@ -1377,6 +1593,12 @@ print_plugin_automatic_install_info_code @@ -1330,6 +1546,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
return; return;
} }
+ if (rpm_format) { + if (rpm_format) {
+ /* Ignore NONE ranked plugins */ + /* Ignore NONE ranked plugins */
+ if ((gst_plugin_feature_get_rank (GST_PLUGIN_FEATURE (factory))) == GST_RANK_NONE) + if ((gst_plugin_feature_get_rank (GST_PLUGIN_FEATURE (factory))) ==
+ GST_RANK_NONE)
+ return; + return;
+ } + }
+ +
/* decoder/demuxer sink pads should always be static and there should only /* decoder/demuxer sink pads should always be static and there should only
* be one, the same applies to encoders/muxers and source pads */ * be one, the same applies to encoders/muxers and source pads */
static_templates = gst_element_factory_get_static_pad_templates (factory); static_templates = gst_element_factory_get_static_pad_templates (factory);
@@ -1413,15 +1635,20 @@ print_plugin_automatic_install_info_code @@ -1366,15 +1589,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
gst_structure_remove_field (s, "rate"); gst_structure_remove_field (s, "rate");
gst_structure_remove_field (s, "depth"); gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "clock-rate"); gst_structure_remove_field (s, "clock-rate");
@ -266,7 +277,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
{ {
const gchar *const *protocols; const gchar *const *protocols;
@@ -1430,13 +1657,19 @@ print_plugin_automatic_install_info_prot @@ -1383,13 +1611,19 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
switch (gst_element_factory_get_uri_type (factory)) { switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK: case GST_URI_SINK:
while (*protocols != NULL) { while (*protocols != NULL) {
@ -288,7 +299,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
++protocols; ++protocols;
} }
break; break;
@@ -1447,7 +1680,7 @@ print_plugin_automatic_install_info_prot @@ -1400,7 +1634,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
} }
static void static void
@ -297,7 +308,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
{ {
GList *features, *l; GList *features, *l;
@@ -1466,11 +1699,15 @@ print_plugin_automatic_install_info (Gst @@ -1419,11 +1653,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
if (feature_plugin == plugin) { if (feature_plugin == plugin) {
GstElementFactory *factory; GstElementFactory *factory;
@ -316,7 +327,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
} }
if (feature_plugin) if (feature_plugin)
gst_object_unref (feature_plugin); gst_object_unref (feature_plugin);
@@ -1492,7 +1729,7 @@ print_all_plugin_automatic_install_info @@ -1445,7 +1683,7 @@ print_all_plugin_automatic_install_info (void)
plugin = (GstPlugin *) (plugins->data); plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins); plugins = g_list_next (plugins);
@ -325,7 +336,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
} }
gst_plugin_list_free (orig_plugins); gst_plugin_list_free (orig_plugins);
} }
@@ -1504,6 +1741,7 @@ main (int argc, char *argv[]) @@ -1457,6 +1695,7 @@ main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE; gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE; gboolean plugin_name = FALSE;
gboolean print_aii = FALSE; gboolean print_aii = FALSE;
@ -333,7 +344,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
gboolean uri_handlers = FALSE; gboolean uri_handlers = FALSE;
gboolean check_exists = FALSE; gboolean check_exists = FALSE;
gchar *min_version = NULL; gchar *min_version = NULL;
@@ -1521,6 +1759,9 @@ main (int argc, char *argv[]) @@ -1474,6 +1713,9 @@ main (int argc, char *argv[])
"or all plugins provide.\n " "or all plugins provide.\n "
"Useful in connection with external automatic plugin " "Useful in connection with external automatic plugin "
"installation mechanisms"), NULL}, "installation mechanisms"), NULL},
@ -343,7 +354,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name, {"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL}, N_("List the plugin contents"), NULL},
{"exists", '\0', 0, G_OPTION_ARG_NONE, &check_exists, {"exists", '\0', 0, G_OPTION_ARG_NONE, &check_exists,
@@ -1650,7 +1891,7 @@ main (int argc, char *argv[]) @@ -1610,7 +1852,7 @@ main (int argc, char *argv[])
/* if there is such a plugin, print out info */ /* if there is such a plugin, print out info */
if (plugin) { if (plugin) {
if (print_aii) { if (print_aii) {
@ -352,7 +363,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
} else { } else {
print_plugin_info (plugin); print_plugin_info (plugin);
print_plugin_features (plugin); print_plugin_features (plugin);
@@ -1663,13 +1904,17 @@ main (int argc, char *argv[]) @@ -1623,13 +1865,17 @@ main (int argc, char *argv[])
if (plugin) { if (plugin) {
if (print_aii) { if (print_aii) {
@ -369,6 +380,9 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst
+ else + else
+ g_printerr (_("Could not load plugin file: %s\n"), + g_printerr (_("Could not load plugin file: %s\n"),
+ error->message); + error->message);
g_error_free (error); g_clear_error (&error);
return -1; return -1;
} }
--
2.5.0

View File

@ -9,7 +9,7 @@
%global _gobject_introspection 1.31.1 %global _gobject_introspection 1.31.1
Name: gstreamer1 Name: gstreamer1
Version: 1.6.2 Version: 1.7.1
Release: 1%{?gitcommit:.git%{shortcommit}}%{?dist} Release: 1%{?gitcommit:.git%{shortcommit}}%{?dist}
Summary: GStreamer streaming media framework runtime Summary: GStreamer streaming media framework runtime
@ -117,6 +117,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gstreamer-%{majorminor}/gst-plugi
chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gstreamer-%{majorminor}/gst-ptp-helper chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gstreamer-%{majorminor}/gst-ptp-helper
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-inspect-1.0 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-inspect-1.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-launch-1.0 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-launch-1.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-stats-1.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-typefind-1.0 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-typefind-1.0
chrpath --delete $RPM_BUILD_ROOT%{_datadir}/bash-completion/helpers/gst-completion-helper-%{majorminor} chrpath --delete $RPM_BUILD_ROOT%{_datadir}/bash-completion/helpers/gst-completion-helper-%{majorminor}
@ -148,6 +149,7 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%dir %{_libdir}/gstreamer-%{majorminor} %dir %{_libdir}/gstreamer-%{majorminor}
%{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so %{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so
%{_libdir}/gstreamer-%{majorminor}/libgstcoretracers.so
%{_libdir}/girepository-1.0/Gst-%{majorminor}.typelib %{_libdir}/girepository-1.0/Gst-%{majorminor}.typelib
%{_libdir}/girepository-1.0/GstBase-%{majorminor}.typelib %{_libdir}/girepository-1.0/GstBase-%{majorminor}.typelib
@ -157,6 +159,7 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%{_bindir}/gst-inspect-%{majorminor} %{_bindir}/gst-inspect-%{majorminor}
%{_bindir}/gst-launch-%{majorminor} %{_bindir}/gst-launch-%{majorminor}
%{_bindir}/gst-stats-%{majorminor}
%{_bindir}/gst-typefind-%{majorminor} %{_bindir}/gst-typefind-%{majorminor}
%{_rpmconfigdir}/gstreamer1.prov %{_rpmconfigdir}/gstreamer1.prov
@ -213,6 +216,12 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%changelog %changelog
* Mon Jan 4 2016 Wim Taymans <wtaymans@redhat.com> - 1.7.1-1
- Update to 1.7.1
- update rpm inspect patch
- add gst-stats
- add core traces
* Tue Dec 15 2015 Wim Taymans <wtaymans@redhat.com> - 1.6.2-1 * Tue Dec 15 2015 Wim Taymans <wtaymans@redhat.com> - 1.6.2-1
- Update to 1.6.2 - Update to 1.6.2

View File

@ -1 +1 @@
5e610b5a94c209487310739b39b6c464 gstreamer-1.6.2.tar.xz 2f16116d68c0a3550cfb02792caac04d gstreamer-1.7.1.tar.xz