This commit is contained in:
Wim Taymans 2024-08-21 11:22:34 +02:00
parent 6b45a75086
commit 38f5a1a653
4 changed files with 53 additions and 31 deletions

1
.gitignore vendored
View File

@ -94,3 +94,4 @@
/gstreamer-1.22.8.tar.xz /gstreamer-1.22.8.tar.xz
/gstreamer-1.22.9.tar.xz /gstreamer-1.22.9.tar.xz
/gstreamer-1.22.12.tar.xz /gstreamer-1.22.12.tar.xz
/gstreamer-1.24.6.tar.xz

View File

@ -1,4 +1,4 @@
From 90d355aea6867f18c10431775f2d0cc52aa6c9d2 Mon Sep 17 00:00:00 2001 From 74a22350dacdd176ee7a6a93fa8393b75e0fcd06 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, 5 Mar 2024 10:05:36 +0100
Subject: [PATCH] gst-inspect: add mode to output RPM requires format Subject: [PATCH] gst-inspect: add mode to output RPM requires format
@ -8,10 +8,10 @@ Subject: [PATCH] gst-inspect: add mode to output RPM requires format
1 file changed, 262 insertions(+), 15 deletions(-) 1 file changed, 262 insertions(+), 15 deletions(-)
diff --git a/subprojects/gstreamer/tools/gst-inspect.c b/subprojects/gstreamer/tools/gst-inspect.c diff --git a/subprojects/gstreamer/tools/gst-inspect.c b/subprojects/gstreamer/tools/gst-inspect.c
index 10cba8ddb6..3cf75fe15e 100644 index 7edd8634a5..d38bf1fbd8 100644
--- a/subprojects/gstreamer/tools/gst-inspect.c --- a/subprojects/gstreamer/tools/gst-inspect.c
+++ b/subprojects/gstreamer/tools/gst-inspect.c +++ b/subprojects/gstreamer/tools/gst-inspect.c
@@ -1904,11 +1904,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names) @@ -1934,11 +1934,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names)
return 0; return 0;
} }
@ -241,7 +241,7 @@ index 10cba8ddb6..3cf75fe15e 100644
{ {
GstPadDirection direction; GstPadDirection direction;
const gchar *type_name; const gchar *type_name;
@@ -1934,6 +2151,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) @@ -1966,6 +2183,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
return; return;
} }
@ -255,7 +255,7 @@ index 10cba8ddb6..3cf75fe15e 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);
@@ -1970,15 +2194,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) @@ -2002,15 +2226,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 +280,7 @@ index 10cba8ddb6..3cf75fe15e 100644
{ {
const gchar *const *protocols; const gchar *const *protocols;
@@ -1987,13 +2216,19 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory) @@ -2019,13 +2248,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 +302,7 @@ index 10cba8ddb6..3cf75fe15e 100644
++protocols; ++protocols;
} }
break; break;
@@ -2004,7 +2239,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory) @@ -2036,7 +2271,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
} }
static void static void
@ -311,7 +311,7 @@ index 10cba8ddb6..3cf75fe15e 100644
{ {
GList *features, *l; GList *features, *l;
@@ -2023,11 +2258,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin) @@ -2055,11 +2290,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
if (feature_plugin == plugin) { if (feature_plugin == plugin) {
GstElementFactory *factory; GstElementFactory *factory;
@ -330,7 +330,7 @@ index 10cba8ddb6..3cf75fe15e 100644
} }
if (feature_plugin) if (feature_plugin)
gst_object_unref (feature_plugin); gst_object_unref (feature_plugin);
@@ -2051,7 +2290,7 @@ print_all_plugin_automatic_install_info (void) @@ -2083,7 +2322,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,15 +339,7 @@ index 10cba8ddb6..3cf75fe15e 100644
} }
gst_plugin_list_free (orig_plugins); gst_plugin_list_free (orig_plugins);
} }
@@ -2137,6 +2376,7 @@ real_main (int argc, char *argv[]) @@ -2190,6 +2430,9 @@ real_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 check_version = FALSE;
@@ -2159,6 +2399,9 @@ real_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},
@ -357,7 +349,7 @@ index 10cba8ddb6..3cf75fe15e 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,
@@ -2338,7 +2581,7 @@ real_main (int argc, char *argv[]) @@ -2364,7 +2607,7 @@ real_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) {
@ -365,8 +357,8 @@ index 10cba8ddb6..3cf75fe15e 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_features (plugin); print_plugin_status (plugin);
@@ -2351,13 +2594,17 @@ real_main (int argc, char *argv[]) @@ -2378,14 +2621,18 @@ real_main (int argc, char *argv[])
if (plugin) { if (plugin) {
if (print_aii) { if (print_aii) {
@ -374,6 +366,7 @@ index 10cba8ddb6..3cf75fe15e 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 {
@ -387,5 +380,15 @@ index 10cba8ddb6..3cf75fe15e 100644
exit_code = -1; exit_code = -1;
goto done; goto done;
-- --
2.45.2 2.43.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;

View File

@ -16,8 +16,8 @@
%endif %endif
Name: gstreamer1 Name: gstreamer1
Version: 1.22.12 Version: 1.24.6
Release: 2%{?dist} Release: 1%{?dist}
Summary: GStreamer streaming media framework runtime Summary: GStreamer streaming media framework runtime
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -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: gstreamer-inspect-rpm-format.patch Patch0: 0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch
Source1: gstreamer1.prov Source1: gstreamer1.prov
Source2: gstreamer1.attr Source2: gstreamer1.attr
@ -49,7 +49,12 @@ 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
@ -126,6 +131,7 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%{_libexecdir}/gstreamer-%{majorminor}/gst-plugins-doc-cache-generator %{_libexecdir}/gstreamer-%{majorminor}/gst-plugins-doc-cache-generator
%{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner %{_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 %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
@ -200,11 +206,23 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%changelog %changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.22.12-2 * Mon Jul 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.6-1
- Bump release for June 2024 mass rebuild - 1.24.6
* Fri Jun 14 2024 Wim Taymans <wtaymans@redhat.com> - 1.22.12-1 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.5-2
- Update to 1.22.12 - 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 * Thu Jan 25 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.22.9-1
- 1.22.9 - 1.22.9

View File

@ -1 +1 @@
SHA512 (gstreamer-1.22.12.tar.xz) = 2443a337a97ac805267d683d049b5023281db54d0d9c561510cff478b0a13256078eb08b1dd89440d2348c84e6e64c8137ce8e6e7c131440a7bd3a8975ebe722 SHA512 (gstreamer-1.24.6.tar.xz) = a6ee368446cf112fc9434bd4f72dbcc4be567625661be14ee4103f710e1678b72b98f01a7017deaef1b1ba379181ddd3be37a380daf9152b5249079fd80de8f5