Compare commits

...

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/gstreamer-1.24.6.tar.xz SOURCES/gstreamer-1.22.1.tar.xz

@ -1 +1 @@
933d35c45485a760330448866dfd44e18725196e SOURCES/gstreamer-1.24.6.tar.xz 5f8b6ab5c08669553750154a11e3b39bf7a86383 SOURCES/gstreamer-1.22.1.tar.xz

@ -1,17 +1,26 @@
From 74a22350dacdd176ee7a6a93fa8393b75e0fcd06 Mon Sep 17 00:00:00 2001 From 642d0d6fef226fb89eaecf0016f8e5e333b9023e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com> From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 5 Mar 2024 10:05:36 +0100 Date: Tue, 23 Jun 2015 10:28:29 +0200
Subject: [PATCH] gst-inspect: add mode to output RPM requires format Subject: [PATCH] gst-inspect: add mode to output RPM requires format
--- ---
subprojects/gstreamer/tools/gst-inspect.c | 277 ++++++++++++++++++++-- tools/gst-inspect.c | 279 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 262 insertions(+), 15 deletions(-) 1 file changed, 263 insertions(+), 16 deletions(-)
diff --git a/subprojects/gstreamer/tools/gst-inspect.c b/subprojects/gstreamer/tools/gst-inspect.c diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 7edd8634a5..d38bf1fbd8 100644 index 8da042946..a057cba09 100644
--- a/subprojects/gstreamer/tools/gst-inspect.c --- a/tools/gst-inspect.c
+++ b/subprojects/gstreamer/tools/gst-inspect.c +++ b/tools/gst-inspect.c
@@ -1934,11 +1934,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names) @@ -394,7 +394,7 @@ print_object_properties_info (GObject * obj, GObjectClass * obj_class,
first_flag = TRUE;
n_print ("%sflags%s: ", PROP_ATTR_NAME_COLOR, RESET_COLOR);
- readable = ! !(param->flags & G_PARAM_READABLE);
+ readable = !!(param->flags & G_PARAM_READABLE);
if (readable && obj != NULL) {
g_object_get_property (obj, param->name, &value);
} else {
@@ -1739,11 +1739,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names)
return 0; return 0;
} }
@ -241,7 +250,7 @@ index 7edd8634a5..d38bf1fbd8 100644
{ {
GstPadDirection direction; GstPadDirection direction;
const gchar *type_name; const gchar *type_name;
@@ -1966,6 +2183,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) @@ -1769,6 +1986,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
return; return;
} }
@ -255,7 +264,7 @@ index 7edd8634a5..d38bf1fbd8 100644
/* 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);
@@ -2002,15 +2226,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) @@ -1805,15 +2029,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");
@ -280,7 +289,7 @@ index 7edd8634a5..d38bf1fbd8 100644
{ {
const gchar *const *protocols; const gchar *const *protocols;
@@ -2019,13 +2248,19 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory) @@ -1822,13 +2051,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) {
@ -302,7 +311,7 @@ index 7edd8634a5..d38bf1fbd8 100644
++protocols; ++protocols;
} }
break; break;
@@ -2036,7 +2271,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory) @@ -1839,7 +2074,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
} }
static void static void
@ -311,7 +320,7 @@ index 7edd8634a5..d38bf1fbd8 100644
{ {
GList *features, *l; GList *features, *l;
@@ -2055,11 +2290,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin) @@ -1858,11 +2093,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
if (feature_plugin == plugin) { if (feature_plugin == plugin) {
GstElementFactory *factory; GstElementFactory *factory;
@ -330,7 +339,7 @@ index 7edd8634a5..d38bf1fbd8 100644
} }
if (feature_plugin) if (feature_plugin)
gst_object_unref (feature_plugin); gst_object_unref (feature_plugin);
@@ -2083,7 +2322,7 @@ print_all_plugin_automatic_install_info (void) @@ -1884,7 +2123,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);
@ -339,7 +348,15 @@ index 7edd8634a5..d38bf1fbd8 100644
} }
gst_plugin_list_free (orig_plugins); gst_plugin_list_free (orig_plugins);
} }
@@ -2190,6 +2430,9 @@ real_main (int argc, char *argv[]) @@ -1951,6 +2190,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;
gboolean check_exists = FALSE;
gboolean color_always = FALSE;
@@ -1972,6 +2212,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},
@ -349,7 +366,7 @@ index 7edd8634a5..d38bf1fbd8 100644
{"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},
{"types", 't', 0, G_OPTION_ARG_STRING, &types, {"types", 't', 0, G_OPTION_ARG_STRING, &types,
@@ -2364,7 +2607,7 @@ real_main (int argc, char *argv[]) @@ -2135,7 +2378,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) {
@ -357,8 +374,8 @@ index 7edd8634a5..d38bf1fbd8 100644
+ print_plugin_automatic_install_info (plugin, print_aii_rpm); + print_plugin_automatic_install_info (plugin, print_aii_rpm);
} else { } else {
print_plugin_info (plugin); print_plugin_info (plugin);
print_plugin_status (plugin); print_plugin_features (plugin);
@@ -2378,14 +2621,18 @@ real_main (int argc, char *argv[]) @@ -2148,13 +2391,17 @@ main (int argc, char *argv[])
if (plugin) { if (plugin) {
if (print_aii) { if (print_aii) {
@ -366,7 +383,6 @@ index 7edd8634a5..d38bf1fbd8 100644
+ print_plugin_automatic_install_info (plugin, print_aii_rpm); + print_plugin_automatic_install_info (plugin, print_aii_rpm);
} else { } else {
print_plugin_info (plugin); print_plugin_info (plugin);
print_plugin_status (plugin);
print_plugin_features (plugin); print_plugin_features (plugin);
} }
} else { } else {
@ -380,15 +396,5 @@ index 7edd8634a5..d38bf1fbd8 100644
exit_code = -1; exit_code = -1;
goto done; goto done;
-- --
2.43.2 2.26.2
--- a/a/a/tools/gst-inspect.c~ 2024-04-30 08:50:02.603031028 -0500
+++ b/b/b/tools/gst-inspect.c 2024-04-30 08:51:26.239844637 -0500
@@ -2408,6 +2408,7 @@
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
+ gboolean print_aii_rpm = FALSE;
gboolean uri_handlers = FALSE;
gboolean check_exists = FALSE;
gboolean check_version = FALSE;

@ -2,7 +2,7 @@
#global gitrel 140 #global gitrel 140
#global gitcommit a70055b58568f7304ba46bd8742232337013487b #global gitcommit a70055b58568f7304ba46bd8742232337013487b
#global shortcommit %%(c=%%{gitcommit}; echo ${c:0:5}) #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
%global _glib2 2.32.0 %global _glib2 2.32.0
%global _libxml2 2.4.0 %global _libxml2 2.4.0
@ -16,11 +16,11 @@
%endif %endif
Name: gstreamer1 Name: gstreamer1
Version: 1.24.6 Version: 1.22.1
Release: 1%{?dist} Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist}
Summary: GStreamer streaming media framework runtime Summary: GStreamer streaming media framework runtime
License: LGPL-2.1-or-later License: LGPLv2+
URL: http://gstreamer.freedesktop.org/ URL: http://gstreamer.freedesktop.org/
%if 0%{?gitrel} %if 0%{?gitrel}
# git clone git://anongit.freedesktop.org/gstreamer/gstreamer # git clone git://anongit.freedesktop.org/gstreamer/gstreamer
@ -30,7 +30,7 @@ Source0: gstreamer-%{version}.tar.xz
Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz
%endif %endif
## For GStreamer RPM provides ## For GStreamer RPM provides
Patch0: 0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch Patch0: gstreamer-inspect-rpm-format.patch
Source1: gstreamer1.prov Source1: gstreamer1.prov
Source2: gstreamer1.attr Source2: gstreamer1.attr
@ -49,12 +49,7 @@ BuildRequires: libcap-devel
BuildRequires: libunwind-devel BuildRequires: libunwind-devel
%endif %endif
BuildRequires: elfutils-devel BuildRequires: elfutils-devel
%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11
BuildRequires: bash-completion-devel
%else
BuildRequires: bash-completion BuildRequires: bash-completion
%endif
BuildRequires: rustc
%description %description
GStreamer is a streaming media framework, based on graphs of filters which GStreamer is a streaming media framework, based on graphs of filters which
@ -92,7 +87,7 @@ GStreamer streaming media framework.
%prep %prep
%setup -q -n gstreamer-%{version} %setup -q -n gstreamer-%{version}
%patch -P 0 -p3 -b .rpm-provides %patch0 -p1 -b .rpm-provides
%build %build
%meson \ %meson \
@ -125,13 +120,7 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%{_libdir}/libgstcontroller-%{majorminor}.so.* %{_libdir}/libgstcontroller-%{majorminor}.so.*
%{_libdir}/libgstnet-%{majorminor}.so.* %{_libdir}/libgstnet-%{majorminor}.so.*
%dir %{_libexecdir}/gstreamer-%{majorminor}/ %{_libexecdir}/gstreamer-%{majorminor}/
%{_libexecdir}/gstreamer-%{majorminor}/gst-completion-helper
%{_libexecdir}/gstreamer-%{majorminor}/gst-hotdoc-plugins-scanner
%{_libexecdir}/gstreamer-%{majorminor}/gst-plugins-doc-cache-generator
%{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
%attr(755,root,root) %caps(cap_net_bind_service,cap_net_admin,cap_sys_nice=ep) %{_libexecdir}/gstreamer-%{majorminor}/gst-ptp-helper
#%%{_libexecdir}/gstreamer-%%{majorminor}/gst-ptp-helper-test
%dir %{_libdir}/gstreamer-%{majorminor} %dir %{_libdir}/gstreamer-%{majorminor}
%{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so %{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so
@ -187,7 +176,7 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 %{_datadir}/aclocal/gst-element-check-%{majorminor}.m4
%dir %{_datadir}/gstreamer-%{majorminor}/gdb %dir %{_datadir}/gstreamer-%{majorminor}/gdb/
%{_datadir}/gstreamer-%{majorminor}/gdb/ %{_datadir}/gstreamer-%{majorminor}/gdb/
%{_datadir}/gdb/auto-load/ %{_datadir}/gdb/auto-load/
@ -206,108 +195,18 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%changelog %changelog
* Mon Jul 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.6-1 * Wed Apr 12 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-2
- 1.24.6 - Bump for rebuild
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.5-1
- 1.24.5
* Wed May 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.4-1
- 1.24.4
* Tue Apr 30 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.3-1
- 1.24.3
* Tue Mar 05 2024 Wim Taymans <wtaymans@redhat.com> - 1.24.0-1
- Update to 1.24.0
* Thu Jan 25 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.22.9-1
- 1.22.9
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.8-1
- 1.22.8
* Mon Nov 20 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.7-2
- Set cap information correctly
- Resolves: rhbz#2238703
* Mon Nov 13 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.7-1
- 1.22.7
* Wed Sep 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.6-1
- 1.22.6
* Fri Jul 21 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.5-1
- Update to 1.22.5
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.4-1 * Tue Mar 21 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-1
- 1.22.4
* Thu Jun 8 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.3-2
- Do setcap on gst-ptp-helper to give the right permissions.
* Thu May 25 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.3-1
- Update to 1.22.3
* Thu Apr 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.2-1
- Update to 1.22.2
* Mon Mar 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-1
- Update to 1.22.1 - Update to 1.22.1
* Tue Jan 24 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.0-1 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-4
- Update to 1.22.0 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jan 20 2023 Wim Taymans <wtaymans@redhat.com> - 1.21.90-1
- Update to 1.21.90
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 11 2023 Wim Taymans <wtaymans@redhat.com> - 1.20.5-1
- Update to 1.20.5
* Thu Oct 13 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.4-1
- Update to 1.20.4
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jul 18 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.3-1
- Update to 1.20.3
* Fri Feb 4 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.0-1
- Update to 1.20.0
* Wed Jan 26 2022 Wim Taymans <wtaymans@redhat.com> - 1.19.3-3
- Fix build, gtk_doc does not exist anymore.
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Nov 11 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.3-1
- Update to 1.19.3
* Thu Sep 23 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.2-1
- Update to 1.19.2
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jun 03 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.1-1 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-3
- Update to 1.19.1 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Apr 6 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-2 * Tue Apr 6 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-2
- Fix build options to disable libunwind and libdw - Fix build options to disable libunwind and libdw

Loading…
Cancel
Save