From 38f5a1a653c9288f6619db98f4ecb537c2a258bb Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 21 Aug 2024 11:22:34 +0200 Subject: [PATCH] 1.24.6 --- .gitignore | 1 + ...d-mode-to-output-RPM-requires-format.patch | 47 ++++++++++--------- gstreamer1.spec | 34 ++++++++++---- sources | 2 +- 4 files changed, 53 insertions(+), 31 deletions(-) rename gstreamer-inspect-rpm-format.patch => 0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch (92%) diff --git a/.gitignore b/.gitignore index 8ecff6b..eb3038e 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /gstreamer-1.22.8.tar.xz /gstreamer-1.22.9.tar.xz /gstreamer-1.22.12.tar.xz +/gstreamer-1.24.6.tar.xz diff --git a/gstreamer-inspect-rpm-format.patch b/0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch similarity index 92% rename from gstreamer-inspect-rpm-format.patch rename to 0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch index d7a3fb7..8f3c047 100644 --- a/gstreamer-inspect-rpm-format.patch +++ b/0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch @@ -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 Date: Tue, 5 Mar 2024 10:05:36 +0100 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(-) 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 +++ 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; } @@ -241,7 +241,7 @@ index 10cba8ddb6..3cf75fe15e 100644 { GstPadDirection direction; 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; } @@ -255,7 +255,7 @@ index 10cba8ddb6..3cf75fe15e 100644 /* 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); -@@ -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, "depth"); gst_structure_remove_field (s, "clock-rate"); @@ -280,7 +280,7 @@ index 10cba8ddb6..3cf75fe15e 100644 { 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)) { case GST_URI_SINK: while (*protocols != NULL) { @@ -302,7 +302,7 @@ index 10cba8ddb6..3cf75fe15e 100644 ++protocols; } 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 @@ -311,7 +311,7 @@ index 10cba8ddb6..3cf75fe15e 100644 { 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) { GstElementFactory *factory; @@ -330,7 +330,7 @@ index 10cba8ddb6..3cf75fe15e 100644 } if (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); plugins = g_list_next (plugins); @@ -339,15 +339,7 @@ index 10cba8ddb6..3cf75fe15e 100644 } gst_plugin_list_free (orig_plugins); } -@@ -2137,6 +2376,7 @@ 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[]) +@@ -2190,6 +2430,9 @@ real_main (int argc, char *argv[]) "or all plugins provide.\n " "Useful in connection with external automatic plugin " "installation mechanisms"), NULL}, @@ -357,7 +349,7 @@ index 10cba8ddb6..3cf75fe15e 100644 {"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name, N_("List the plugin contents"), NULL}, {"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 (plugin) { if (print_aii) { @@ -365,8 +357,8 @@ index 10cba8ddb6..3cf75fe15e 100644 + print_plugin_automatic_install_info (plugin, print_aii_rpm); } else { print_plugin_info (plugin); - print_plugin_features (plugin); -@@ -2351,13 +2594,17 @@ real_main (int argc, char *argv[]) + print_plugin_status (plugin); +@@ -2378,14 +2621,18 @@ real_main (int argc, char *argv[]) if (plugin) { if (print_aii) { @@ -374,6 +366,7 @@ index 10cba8ddb6..3cf75fe15e 100644 + print_plugin_automatic_install_info (plugin, print_aii_rpm); } else { print_plugin_info (plugin); + print_plugin_status (plugin); print_plugin_features (plugin); } } else { @@ -387,5 +380,15 @@ index 10cba8ddb6..3cf75fe15e 100644 exit_code = -1; 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; diff --git a/gstreamer1.spec b/gstreamer1.spec index 8986535..71b161f 100644 --- a/gstreamer1.spec +++ b/gstreamer1.spec @@ -16,8 +16,8 @@ %endif Name: gstreamer1 -Version: 1.22.12 -Release: 2%{?dist} +Version: 1.24.6 +Release: 1%{?dist} Summary: GStreamer streaming media framework runtime 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 %endif ## 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 Source2: gstreamer1.attr @@ -49,7 +49,12 @@ BuildRequires: libcap-devel BuildRequires: libunwind-devel %endif BuildRequires: elfutils-devel -BuildRequires: bash-completion +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11 +BuildRequires: bash-completion-devel +%else +BuildRequires: bash-completion +%endif +BuildRequires: rustc %description 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-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} %{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so @@ -200,11 +206,23 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %changelog -* Mon Jun 24 2024 Troy Dawson - 1.22.12-2 -- Bump release for June 2024 mass rebuild +* Mon Jul 29 2024 Gwyn Ciesla - 1.24.6-1 +- 1.24.6 -* Fri Jun 14 2024 Wim Taymans - 1.22.12-1 -- Update to 1.22.12 +* Thu Jul 18 2024 Fedora Release Engineering - 1.24.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 21 2024 Gwyn Ciesla - 1.24.5-1 +- 1.24.5 + +* Wed May 29 2024 Gwyn Ciesla - 1.24.4-1 +- 1.24.4 + +* Tue Apr 30 2024 Gwyn Ciesla - 1.24.3-1 +- 1.24.3 + +* Tue Mar 05 2024 Wim Taymans - 1.24.0-1 +- Update to 1.24.0 * Thu Jan 25 2024 Gwyn Ciesla - 1.22.9-1 - 1.22.9 diff --git a/sources b/sources index a3aa3b5..dbfae6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gstreamer-1.22.12.tar.xz) = 2443a337a97ac805267d683d049b5023281db54d0d9c561510cff478b0a13256078eb08b1dd89440d2348c84e6e64c8137ce8e6e7c131440a7bd3a8975ebe722 +SHA512 (gstreamer-1.24.6.tar.xz) = a6ee368446cf112fc9434bd4f72dbcc4be567625661be14ee4103f710e1678b72b98f01a7017deaef1b1ba379181ddd3be37a380daf9152b5249079fd80de8f5