From 969b1173770c8ecb814aa389c20f028fdf21b0dc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Jan 04 2016 10:58:34 +0000 Subject: Update to 1.7.1 - update rpm inspect patch - add gst-stats - add core traces --- diff --git a/.gitignore b/.gitignore index 8570f58..f87cb51 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /gstreamer-1.6.0.tar.xz /gstreamer-1.6.1.tar.xz /gstreamer-1.6.2.tar.xz +/gstreamer-1.7.1.tar.xz diff --git a/gstreamer-inspect-rpm-format.patch b/gstreamer-inspect-rpm-format.patch index 08f2884..8a6a0dd 100644 --- a/gstreamer-inspect-rpm-format.patch +++ b/gstreamer-inspect-rpm-format.patch @@ -1,7 +1,17 @@ -diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst-inspect.c ---- gstreamer-0.11.94.orig/tools/gst-inspect.c 2012-09-01 18:02:10.000000000 -0400 -+++ gstreamer-0.11.94/tools/gst-inspect.c 2012-09-14 08:04:52.690369047 -0400 -@@ -1350,9 +1350,225 @@ print_element_info (GstElementFactory * +From 8dfeddab12777e90f8739f9dab33c62657465854 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Mon, 4 Jan 2016 11:39:33 +0100 +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; } @@ -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); + } +} -+ -+static void + + static void +-print_plugin_automatic_install_info_codecs (GstElementFactory * factory) +print_gst_structure_append_field_index (GList * strings, const char *field, + 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); +} - - static void --print_plugin_automatic_install_info_codecs (GstElementFactory * factory) ++ ++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 +@@ -1330,6 +1546,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) return; } + if (rpm_format) { + /* 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; + } + /* 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 +@@ -1366,15 +1589,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) gst_structure_remove_field (s, "rate"); gst_structure_remove_field (s, "depth"); 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; -@@ -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)) { case GST_URI_SINK: 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; } 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 @@ -297,7 +308,7 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst { 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) { 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) 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); 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); } -@@ -1504,6 +1741,7 @@ main (int argc, char *argv[]) +@@ -1457,6 +1695,7 @@ main (int argc, char *argv[]) gboolean do_print_blacklist = FALSE; gboolean plugin_name = 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 check_exists = FALSE; 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 " "Useful in connection with external automatic plugin " "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, N_("List the plugin contents"), NULL}, {"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 (plugin) { 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 { print_plugin_info (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 (print_aii) { @@ -369,6 +380,9 @@ diff -urp gstreamer-0.11.94.orig/tools/gst-inspect.c gstreamer-0.11.94/tools/gst + else + g_printerr (_("Could not load plugin file: %s\n"), + error->message); - g_error_free (error); + g_clear_error (&error); return -1; } +-- +2.5.0 + diff --git a/gstreamer1.spec b/gstreamer1.spec index 01db71e..2dec4fc 100644 --- a/gstreamer1.spec +++ b/gstreamer1.spec @@ -9,7 +9,7 @@ %global _gobject_introspection 1.31.1 Name: gstreamer1 -Version: 1.6.2 +Version: 1.7.1 Release: 1%{?gitcommit:.git%{shortcommit}}%{?dist} 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%{_bindir}/gst-inspect-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%{_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} %{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so +%{_libdir}/gstreamer-%{majorminor}/libgstcoretracers.so %{_libdir}/girepository-1.0/Gst-%{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-launch-%{majorminor} +%{_bindir}/gst-stats-%{majorminor} %{_bindir}/gst-typefind-%{majorminor} %{_rpmconfigdir}/gstreamer1.prov @@ -213,6 +216,12 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %changelog +* Mon Jan 4 2016 Wim Taymans - 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 - 1.6.2-1 - Update to 1.6.2 diff --git a/sources b/sources index 2760efe..0871538 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e610b5a94c209487310739b39b6c464 gstreamer-1.6.2.tar.xz +2f16116d68c0a3550cfb02792caac04d gstreamer-1.7.1.tar.xz