diff --git a/.gitignore b/.gitignore index 97ee6b3..c4ce133 100644 --- a/.gitignore +++ b/.gitignore @@ -75,41 +75,3 @@ /gstreamer-1.18.1.tar.xz /gstreamer-1.18.2.tar.xz /gstreamer-1.18.4.tar.xz -/gstreamer-1.19.1.tar.xz -/gstreamer-1.19.2.tar.xz -/gstreamer-1.19.3.tar.xz -/gstreamer-1.20.0.tar.xz -/gstreamer-1.20.3.tar.xz -/gstreamer-1.20.4.tar.xz -/gstreamer-1.20.5.tar.xz -/gstreamer-1.21.90.tar.xz -/gstreamer-1.22.0.tar.xz -/gstreamer-1.22.1.tar.xz -/gstreamer-1.22.2.tar.xz -/gstreamer-1.22.3.tar.xz -/gstreamer-1.22.4.tar.xz -/gstreamer-1.22.5.tar.xz -/gstreamer-1.22.6.tar.xz -/gstreamer-1.22.7.tar.xz -/gstreamer-1.22.8.tar.xz -/gstreamer-1.22.9.tar.xz -/gstreamer-1.24.0.tar.xz -/gstreamer-1.24.3.tar.xz -/gstreamer-1.24.4.tar.xz -/gstreamer-1.24.5.tar.xz -/gstreamer-1.24.6.tar.xz -/gstreamer-1.24.7.tar.xz -/gstreamer-1.24.8.tar.xz -/gstreamer-1.24.9.tar.xz -/gstreamer-1.24.10.tar.xz -/gstreamer-1.24.11.tar.xz -/gstreamer-1.26.0.tar.xz -/gstreamer-1.26.1.tar.xz -/gstreamer-1.26.2.tar.xz -/gstreamer-1.26.3.tar.xz -/gstreamer-1.26.5.tar.xz -/gstreamer-1.26.6.tar.xz -/gstreamer-1.26.7.tar.xz -/gstreamer-1.26.8.tar.xz -/gstreamer-1.26.9.tar.xz -/gstreamer-1.26.10.tar.xz diff --git a/0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch b/gstreamer-inspect-rpm-format.patch similarity index 88% rename from 0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch rename to gstreamer-inspect-rpm-format.patch index 8f3c047..0114c06 100644 --- a/0001-gst-inspect-add-mode-to-output-RPM-requires-format.patch +++ b/gstreamer-inspect-rpm-format.patch @@ -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 -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 --- - subprojects/gstreamer/tools/gst-inspect.c | 277 ++++++++++++++++++++-- - 1 file changed, 262 insertions(+), 15 deletions(-) + tools/gst-inspect.c | 279 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 263 insertions(+), 16 deletions(-) -diff --git a/subprojects/gstreamer/tools/gst-inspect.c b/subprojects/gstreamer/tools/gst-inspect.c -index 7edd8634a5..d38bf1fbd8 100644 ---- a/subprojects/gstreamer/tools/gst-inspect.c -+++ b/subprojects/gstreamer/tools/gst-inspect.c -@@ -1934,11 +1934,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names) +diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c +index 8da042946..a057cba09 100644 +--- a/tools/gst-inspect.c ++++ b/tools/gst-inspect.c +@@ -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; } @@ -241,7 +250,7 @@ index 7edd8634a5..d38bf1fbd8 100644 { GstPadDirection direction; 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; } @@ -255,7 +264,7 @@ index 7edd8634a5..d38bf1fbd8 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); -@@ -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, "depth"); gst_structure_remove_field (s, "clock-rate"); @@ -280,7 +289,7 @@ index 7edd8634a5..d38bf1fbd8 100644 { 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)) { case GST_URI_SINK: while (*protocols != NULL) { @@ -302,7 +311,7 @@ index 7edd8634a5..d38bf1fbd8 100644 ++protocols; } 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 @@ -311,7 +320,7 @@ index 7edd8634a5..d38bf1fbd8 100644 { 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) { GstElementFactory *factory; @@ -330,7 +339,7 @@ index 7edd8634a5..d38bf1fbd8 100644 } if (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); plugins = g_list_next (plugins); @@ -339,7 +348,15 @@ index 7edd8634a5..d38bf1fbd8 100644 } 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 " "Useful in connection with external automatic plugin " "installation mechanisms"), NULL}, @@ -349,7 +366,7 @@ index 7edd8634a5..d38bf1fbd8 100644 {"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name, N_("List the plugin contents"), NULL}, {"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 (plugin) { if (print_aii) { @@ -357,8 +374,8 @@ index 7edd8634a5..d38bf1fbd8 100644 + print_plugin_automatic_install_info (plugin, print_aii_rpm); } else { print_plugin_info (plugin); - print_plugin_status (plugin); -@@ -2378,14 +2621,18 @@ real_main (int argc, char *argv[]) + print_plugin_features (plugin); +@@ -2148,13 +2391,17 @@ main (int argc, char *argv[]) if (plugin) { if (print_aii) { @@ -366,7 +383,6 @@ index 7edd8634a5..d38bf1fbd8 100644 + print_plugin_automatic_install_info (plugin, print_aii_rpm); } else { print_plugin_info (plugin); - print_plugin_status (plugin); print_plugin_features (plugin); } } else { @@ -380,15 +396,5 @@ index 7edd8634a5..d38bf1fbd8 100644 exit_code = -1; 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; diff --git a/gstreamer1.spec b/gstreamer1.spec index a1e2c4a..dfb620d 100644 --- a/gstreamer1.spec +++ b/gstreamer1.spec @@ -2,7 +2,7 @@ #global gitrel 140 #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 _libxml2 2.4.0 @@ -15,28 +15,32 @@ %bcond_with unwind %endif +# The 1.19.1 development release was wrongly pushed into stable f34. +# Instead of updating the epoch, 1.19.1-1.18.4.x is used because this +# is a temporary version problem that will resolve itself in f35. +%global realversion 1.18.4 + Name: gstreamer1 -Version: 1.26.10 -Release: 1%{?dist} +Version: 1.19.1 +Release: 2.%{realversion}%{?gitcommit:.git%{shortcommit}}%{?dist} Summary: GStreamer streaming media framework runtime -License: LGPL-2.1-or-later +License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ %if 0%{?gitrel} # git clone git://anongit.freedesktop.org/gstreamer/gstreamer # cd gstreamer; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck -Source0: gstreamer-%{version}.tar.xz +Source0: gstreamer-%{realversion}.tar.xz %else -Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz +Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{realversion}.tar.xz %endif ## 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 Source2: gstreamer1.attr BuildRequires: meson >= 0.48.0 BuildRequires: gcc -BuildRequires: libatomic BuildRequires: glib2-devel >= %{_glib2} BuildRequires: libxml2-devel >= %{_libxml2} BuildRequires: gobject-introspection-devel >= %{_gobject_introspection} @@ -50,12 +54,7 @@ BuildRequires: libcap-devel BuildRequires: libunwind-devel %endif BuildRequires: elfutils-devel -%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11 -BuildRequires: bash-completion-devel -%else -BuildRequires: bash-completion -%endif -BuildRequires: rustc +BuildRequires: bash-completion %description GStreamer is a streaming media framework, based on graphs of filters which @@ -92,13 +91,14 @@ GStreamer streaming media framework. %prep -%setup -q -n gstreamer-%{version} -%patch -P 0 -p3 -b .rpm-provides +%setup -q -n gstreamer-%{realversion} +%patch0 -p1 -b .rpm-provides %build %meson \ -D package-name='Fedora GStreamer package' \ -D package-origin='http://download.fedoraproject.org' \ + -D gtk_doc=disabled \ -D tests=disabled -D examples=disabled \ -D ptp-helper-permissions=capabilities \ %{!?with_unwind:-D libunwind=disabled -D libdw=disabled } \ @@ -119,20 +119,14 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %files -f gstreamer-%{majorminor}.lang %license COPYING -%doc AUTHORS NEWS README.md README.static-linking RELEASE +%doc AUTHORS NEWS README RELEASE %{_libdir}/libgstreamer-%{majorminor}.so.* %{_libdir}/libgstbase-%{majorminor}.so.* %{_libdir}/libgstcheck-%{majorminor}.so.* %{_libdir}/libgstcontroller-%{majorminor}.so.* %{_libdir}/libgstnet-%{majorminor}.so.* -%dir %{_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 +%{_libexecdir}/gstreamer-%{majorminor}/ %dir %{_libdir}/gstreamer-%{majorminor} %{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so @@ -188,7 +182,7 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 -%dir %{_datadir}/gstreamer-%{majorminor}/gdb +%dir %{_datadir}/gstreamer-%{majorminor}/gdb/ %{_datadir}/gstreamer-%{majorminor}/gdb/ %{_datadir}/gdb/auto-load/ @@ -198,8 +192,6 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %{_libdir}/pkgconfig/gstreamer-check-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-net-%{majorminor}.pc -%{_datadir}/cmake/FindGStreamer.cmake - %if 0 %files devel-docs %doc %{_datadir}/gtk-doc/html/gstreamer-%{majorminor} @@ -209,162 +201,15 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %changelog -* Tue Jan 06 2026 Gwyn Ciesla - 1.26.10-1 -- 1.26.10 +* Thu Jun 17 2021 Wim Taymans - 1.19.1-2.1.18.4 +- Bump for rebuild -* Wed Dec 03 2025 Gwyn Ciesla - 1.26.9-1 -- 1.26.9 +* Thu Jun 17 2021 Wim Taymans - 1.19.1-1.1.18.4 +- Move baserelease before real version -* Wed Nov 12 2025 Gwyn Ciesla - 1.26.8-1 -- 1.26.8 - -* Tue Oct 14 2025 Gwyn Ciesla - 1.26.7-1 -- 1.26.7 - -* Mon Sep 15 2025 Gwyn Ciesla - 1.26.6-1 -- 1.26.6 - -* Fri Aug 08 2025 Gwyn Ciesla - 1.26.5-2 -- Introspection patch - -* Fri Aug 08 2025 Gwyn Ciesla - 1.26.5-1 -- 1.26.5 - -* Thu Jul 24 2025 Fedora Release Engineering - 1.26.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jun 27 2025 Gwyn Ciesla - 1.26.3-1 -- 1.26.3 - -* Fri May 30 2025 Gwyn Ciesla - 1.26.2-1 -- 1.26.2 - -* Fri Apr 25 2025 Gwyn Ciesla - 1.26.1-1 -- 1.26.1 - -* Wed Mar 12 2025 Gwyn Ciesla - 1.26.0-1 -- 1.26.0 - -* Fri Jan 17 2025 Fedora Release Engineering - 1.24.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 07 2025 Gwyn Ciesla - 1.24.11-1 -- 1.24.11 - -* Wed Dec 04 2024 Gwyn Ciesla - 1.24.10-1 -- 1.24.10 - -* Thu Oct 31 2024 Gwyn Ciesla - 1.24.9-1 -- 1.24.9 - -* Thu Sep 19 2024 Gwyn Ciesla - 1.24.8-1 -- 1.24.8 - -* Wed Aug 21 2024 Gwyn Ciesla - 1.24.7-1 -- 1.24.7 - -* Mon Jul 29 2024 Gwyn Ciesla - 1.24.6-1 -- 1.24.6 - -* 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 - -* Wed Jan 24 2024 Fedora Release Engineering - 1.22.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.22.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 18 2023 Gwyn Ciesla - 1.22.8-1 -- 1.22.8 - -* Mon Nov 20 2023 Wim Taymans - 1.22.7-2 -- Set cap information correctly -- Resolves: rhbz#2238703 - -* Mon Nov 13 2023 Gwyn Ciesla - 1.22.7-1 -- 1.22.7 - -* Wed Sep 20 2023 Gwyn Ciesla - 1.22.6-1 -- 1.22.6 - -* Fri Jul 21 2023 Wim Taymans - 1.22.5-1 -- Update to 1.22.5 - -* Thu Jul 20 2023 Fedora Release Engineering - 1.22.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 20 2023 Gwyn Ciesla - 1.22.4-1 -- 1.22.4 - -* Thu Jun 8 2023 Wim Taymans - 1.22.3-2 -- Do setcap on gst-ptp-helper to give the right permissions. - -* Thu May 25 2023 Wim Taymans - 1.22.3-1 -- Update to 1.22.3 - -* Thu Apr 13 2023 Wim Taymans - 1.22.2-1 -- Update to 1.22.2 - -* Mon Mar 13 2023 Wim Taymans - 1.22.1-1 -- Update to 1.22.1 - -* Tue Jan 24 2023 Wim Taymans - 1.22.0-1 -- Update to 1.22.0 - -* Fri Jan 20 2023 Wim Taymans - 1.21.90-1 -- Update to 1.21.90 - -* Thu Jan 19 2023 Fedora Release Engineering - 1.20.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jan 11 2023 Wim Taymans - 1.20.5-1 -- Update to 1.20.5 - -* Thu Oct 13 2022 Wim Taymans - 1.20.4-1 -- Update to 1.20.4 - -* Thu Jul 21 2022 Fedora Release Engineering - 1.20.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jul 18 2022 Wim Taymans - 1.20.3-1 -- Update to 1.20.3 - -* Fri Feb 4 2022 Wim Taymans - 1.20.0-1 -- Update to 1.20.0 - -* Wed Jan 26 2022 Wim Taymans - 1.19.3-3 -- Fix build, gtk_doc does not exist anymore. - -* Thu Jan 20 2022 Fedora Release Engineering - 1.19.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 11 2021 Wim Taymans - 1.19.3-1 -- Update to 1.19.3 - -* Thu Sep 23 2021 Wim Taymans - 1.19.2-1 -- Update to 1.19.2 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.19.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 03 2021 Wim Taymans - 1.19.1-1 -- Update to 1.19.1 +* Tue Jun 15 2021 Wim Taymans - 1.19.1-1.18.4.1 +- Reverted from wrong unstable 1.19.1 update. F34 should keep the + stable 1.18.4 version. * Tue Apr 6 2021 Wim Taymans - 1.18.4-2 - Fix build options to disable libunwind and libdw diff --git a/sources b/sources index 848e92d..6df7e1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gstreamer-1.26.10.tar.xz) = c12a2347052b4f92d5180bc62d0c854900f724fb9a3a4f238b6c6d1abeaef217f11551d0f6148ef04eecfbf74bb54d82ab415ec09fcb09aeabbfcc470437e944 +SHA512 (gstreamer-1.18.4.tar.xz) = 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a