Compare commits

..

No commits in common. 'c9' and 'c8' have entirely different histories.
c9 ... c8

2
.gitignore vendored

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

@ -1 +1 @@
5f8b6ab5c08669553750154a11e3b39bf7a86383 SOURCES/gstreamer-1.22.1.tar.xz 7a1f4c3758d2e5f4dc7029604f92e00be99120dd SOURCES/gstreamer-1.16.1.tar.xz

@ -1,17 +1,14 @@
From 642d0d6fef226fb89eaecf0016f8e5e333b9023e Mon Sep 17 00:00:00 2001 From 2f5019ea84f197313ae39d2e2b36dfc49e542ff1 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com> From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 23 Jun 2015 10:28:29 +0200 Date: Tue, 23 Jun 2015 10:28:29 +0200
Subject: [PATCH] gst-inspect: add mode to output RPM requires format Subject: gst-inspect: add mode to output RPM requires format
---
tools/gst-inspect.c | 279 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 263 insertions(+), 16 deletions(-)
diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 8da042946..a057cba09 100644 index 1b5ed83f8..2a04fbdac 100644
--- a/tools/gst-inspect.c --- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c +++ b/tools/gst-inspect.c
@@ -394,7 +394,7 @@ print_object_properties_info (GObject * obj, GObjectClass * obj_class, @@ -386,7 +386,7 @@ print_object_properties_info (GObject * obj, GObjectClass * obj_class,
first_flag = TRUE; first_flag = TRUE;
n_print ("%sflags%s: ", PROP_ATTR_NAME_COLOR, RESET_COLOR); n_print ("%sflags%s: ", PROP_ATTR_NAME_COLOR, RESET_COLOR);
@ -20,7 +17,7 @@ index 8da042946..a057cba09 100644
if (readable && obj != NULL) { if (readable && obj != NULL) {
g_object_get_property (obj, param->name, &value); g_object_get_property (obj, param->name, &value);
} else { } else {
@@ -1739,11 +1739,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names) @@ -1726,11 +1726,228 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names)
return 0; return 0;
} }
@ -250,7 +247,7 @@ index 8da042946..a057cba09 100644
{ {
GstPadDirection direction; GstPadDirection direction;
const gchar *type_name; const gchar *type_name;
@@ -1769,6 +1986,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) @@ -1756,6 +1973,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
return; return;
} }
@ -264,7 +261,7 @@ index 8da042946..a057cba09 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);
@@ -1805,15 +2029,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory) @@ -1792,15 +2016,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");
@ -289,7 +286,7 @@ index 8da042946..a057cba09 100644
{ {
const gchar *const *protocols; const gchar *const *protocols;
@@ -1822,13 +2051,19 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory) @@ -1809,13 +2038,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) {
@ -311,7 +308,7 @@ index 8da042946..a057cba09 100644
++protocols; ++protocols;
} }
break; break;
@@ -1839,7 +2074,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory) @@ -1826,7 +2061,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
} }
static void static void
@ -320,7 +317,7 @@ index 8da042946..a057cba09 100644
{ {
GList *features, *l; GList *features, *l;
@@ -1858,11 +2093,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin) @@ -1845,11 +2080,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
if (feature_plugin == plugin) { if (feature_plugin == plugin) {
GstElementFactory *factory; GstElementFactory *factory;
@ -339,7 +336,7 @@ index 8da042946..a057cba09 100644
} }
if (feature_plugin) if (feature_plugin)
gst_object_unref (feature_plugin); gst_object_unref (feature_plugin);
@@ -1884,7 +2123,7 @@ print_all_plugin_automatic_install_info (void) @@ -1871,7 +2110,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);
@ -348,15 +345,15 @@ index 8da042946..a057cba09 100644
} }
gst_plugin_list_free (orig_plugins); gst_plugin_list_free (orig_plugins);
} }
@@ -1951,6 +2190,7 @@ main (int argc, char *argv[]) @@ -1938,6 +2177,7 @@ main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE; gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE; gboolean plugin_name = FALSE;
gboolean print_aii = FALSE; gboolean print_aii = FALSE;
+ gboolean print_aii_rpm = FALSE; + gboolean print_aii_rpm = FALSE;
gboolean uri_handlers = FALSE; gboolean uri_handlers = FALSE;
gboolean check_exists = FALSE; gboolean check_exists = FALSE;
gboolean color_always = FALSE; gchar *min_version = NULL;
@@ -1972,6 +2212,9 @@ main (int argc, char *argv[]) @@ -1958,6 +2198,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},
@ -366,7 +363,7 @@ index 8da042946..a057cba09 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,
@@ -2135,7 +2378,7 @@ main (int argc, char *argv[]) @@ -2113,7 +2356,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) {
@ -375,7 +372,7 @@ index 8da042946..a057cba09 100644
} else { } else {
print_plugin_info (plugin); print_plugin_info (plugin);
print_plugin_features (plugin); print_plugin_features (plugin);
@@ -2148,13 +2391,17 @@ main (int argc, char *argv[]) @@ -2126,13 +2369,17 @@ main (int argc, char *argv[])
if (plugin) { if (plugin) {
if (print_aii) { if (print_aii) {
@ -395,6 +392,3 @@ index 8da042946..a057cba09 100644
g_clear_error (&error); g_clear_error (&error);
exit_code = -1; exit_code = -1;
goto done; goto done;
--
2.26.2

@ -9,7 +9,7 @@
# Based on other provides scripts from RPM # Based on other provides scripts from RPM
# #
filelist=`grep -e '^.*/gstreamer-1.0/lib.*.so$' | sed "s/['\"]/\\\&/g"` filelist=`grep -e '.so$' | sed "s/['\"]/\\\&/g"`
# --- Alpha does not mark 64bit dependencies• # --- Alpha does not mark 64bit dependencies•
case `uname -m` in case `uname -m` in
@ -17,8 +17,8 @@ case `uname -m` in
*) mark64="()(64bit)" ;; *) mark64="()(64bit)" ;;
esac esac
solist=$(echo $filelist | \ solist=$(echo $filelist | grep "libgst" | \
xargs file -L 2>/dev/null | grep "ELF" | cut -d: -f1 ) xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1 )
function getmark() function getmark()
{ {

@ -7,16 +7,9 @@
%global _glib2 2.32.0 %global _glib2 2.32.0
%global _libxml2 2.4.0 %global _libxml2 2.4.0
%global _gobject_introspection 1.31.1 %global _gobject_introspection 1.31.1
%global __python %{__python3}
%if 0%{?fedora}
%bcond_without unwind
%else
%bcond_with unwind
%endif
Name: gstreamer1 Name: gstreamer1
Version: 1.22.1 Version: 1.16.1
Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist} Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist}
Summary: GStreamer streaming media framework runtime Summary: GStreamer streaming media framework runtime
@ -34,22 +27,34 @@ Patch0: gstreamer-inspect-rpm-format.patch
Source1: gstreamer1.prov Source1: gstreamer1.prov
Source2: gstreamer1.attr Source2: gstreamer1.attr
BuildRequires: meson >= 0.48.0
BuildRequires: gcc
BuildRequires: glib2-devel >= %{_glib2} BuildRequires: glib2-devel >= %{_glib2}
BuildRequires: libxml2-devel >= %{_libxml2} BuildRequires: libxml2-devel >= %{_libxml2}
BuildRequires: gobject-introspection-devel >= %{_gobject_introspection} BuildRequires: gobject-introspection-devel >= %{_gobject_introspection}
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: m4
BuildRequires: check-devel BuildRequires: check-devel
BuildRequires: gtk-doc >= 1.3
BuildRequires: gettext BuildRequires: gettext
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libcap-devel BuildRequires: libcap-devel
%if %{with unwind}
BuildRequires: libunwind-devel # ./autogen.sh deps
%endif BuildRequires: automake gettext-devel libtool
BuildRequires: elfutils-devel BuildRequires: chrpath
BuildRequires: bash-completion
### documentation requirements
BuildRequires: python3
BuildRequires: openjade
BuildRequires: texlive-jadetex
BuildRequires: libxslt
BuildRequires: docbook-style-dsssl
BuildRequires: docbook-style-xsl
BuildRequires: docbook-utils
BuildRequires: transfig
BuildRequires: netpbm-progs
BuildRequires: texlive-dvips
BuildRequires: ghostscript
%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
@ -73,7 +78,7 @@ Conflicts: gstreamer1-plugins-bad-free-devel < 1.13
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use %{name}.
%if 0
%package devel-docs %package devel-docs
Summary: Developer documentation for GStreamer streaming media framework Summary: Developer documentation for GStreamer streaming media framework
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -82,7 +87,6 @@ BuildArch: noarch
%description devel-docs %description devel-docs
This %{name}-devel-docs contains developer documentation for the This %{name}-devel-docs contains developer documentation for the
GStreamer streaming media framework. GStreamer streaming media framework.
%endif
%prep %prep
@ -90,30 +94,41 @@ GStreamer streaming media framework.
%patch0 -p1 -b .rpm-provides %patch0 -p1 -b .rpm-provides
%build %build
%meson \ NOCONFIGURE=1 \
-D package-name='Fedora GStreamer package' \ ./autogen.sh
-D package-origin='http://download.fedoraproject.org' \
-D tests=disabled -D examples=disabled \ %configure \
-D ptp-helper-permissions=capabilities \ --with-package-name='Fedora GStreamer package' \
%{!?with_unwind:-D libunwind=disabled -D libdw=disabled } \ --with-package-origin='http://download.fedoraproject.org' \
-D dbghelp=disabled \ --enable-gtk-doc \
-D doc=disabled --enable-debug \
%meson_build --disable-fatal-warnings \
--disable-silent-rules \
--disable-tests --disable-examples \
--with-ptp-helper-permissions=capabilities
%make_build V=1
%install %install
%meson_install %make_install
%find_lang gstreamer-%{majorminor} %find_lang gstreamer-%{majorminor}
# Clean out files that should not be part of the rpm.
find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -fv {} ';'
# Add the provides script # Add the provides script
install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/gstreamer1.prov install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/gstreamer1.prov
# Add the gstreamer plugin file attribute entry (rpm >= 4.9.0) # Add the gstreamer plugin file attribute entry (rpm >= 4.9.0)
install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer1.attr install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer1.attr
%ldconfig_scriptlets %ldconfig_scriptlets
%files -f gstreamer-%{majorminor}.lang %files -f gstreamer-%{majorminor}.lang
%license COPYING %license COPYING
%doc AUTHORS NEWS README.md README.static-linking RELEASE %doc AUTHORS NEWS README RELEASE
%{_libdir}/libgstreamer-%{majorminor}.so.* %{_libdir}/libgstreamer-%{majorminor}.so.*
%{_libdir}/libgstbase-%{majorminor}.so.* %{_libdir}/libgstbase-%{majorminor}.so.*
%{_libdir}/libgstcheck-%{majorminor}.so.* %{_libdir}/libgstcheck-%{majorminor}.so.*
@ -175,8 +190,6 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%{_datadir}/gir-1.0/GstNet-%{majorminor}.gir %{_datadir}/gir-1.0/GstNet-%{majorminor}.gir
%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 %{_datadir}/aclocal/gst-element-check-%{majorminor}.m4
%dir %{_datadir}/gstreamer-%{majorminor}/gdb/
%{_datadir}/gstreamer-%{majorminor}/gdb/ %{_datadir}/gstreamer-%{majorminor}/gdb/
%{_datadir}/gdb/auto-load/ %{_datadir}/gdb/auto-load/
@ -186,125 +199,28 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%{_libdir}/pkgconfig/gstreamer-check-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-check-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-net-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-net-%{majorminor}.pc
%if 0
%files devel-docs %files devel-docs
%doc %{_datadir}/gtk-doc/html/gstreamer-%{majorminor} %doc %{_datadir}/gtk-doc/html/gstreamer-%{majorminor}
%doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor} %doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor} %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%endif
%changelog %changelog
* Wed Apr 12 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-2 * Mon Nov 18 2019 Tomas Pelka <tpelka@redhat.com> - 1.16.1-2
- Bump for rebuild - Update to 1.16.2 for correctly pick up for side gating
- Resolves: rhbz#1756299
* Tue Mar 21 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-1
- Update to 1.22.1
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.18.4-3
- 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
- Fix build options to disable libunwind and libdw
* Tue Mar 16 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-1
- Update to 1.18.4
* Tue Feb 23 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.2-3
- Use libunwind only on fedora
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Dec 10 2020 Wim Taymans <wtaymans@redhat.com> - 1.18.2-1
- Update to 1.18.2
* Fri Oct 30 2020 Wim Taymans <wtaymans@redhat.com> - 1.18.1-1
- Update to 1.18.1
* Tue Sep 8 2020 Wim Taymans <wtaymans@redhat.com> - 1.18.0-1 * Tue Nov 12 2019 Wim Taymans <wtaymans@redhat.com> - 1.16.1-1
- Update to 1.18.0
* Fri Aug 21 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.90-1
- Update to 1.17.90
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 6 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.2-1
- Update to 1.17.2
* Mon Jun 22 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.1-2
- Enable debug again
* Mon Jun 22 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.1-1
- Update to 1.17.1
- Update to meson build
- Disable docs because it needs Hotdoc, which is not in Fedora yet
- remove BuildRequires: for gtk-doc and autoconf related things
- Add BuildRequires: for libunwind-devel, elfutils-devel, bash-completion
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 2 2020 Wim Taymans <wtaymans@redhat.com> - 1.16.2-1
- Update to 1.16.2
* Tue Sep 24 2019 Wim Taymans <wtaymans@redhat.com> - 1.16.1-1
- Update to 1.16.1 - Update to 1.16.1
- Enable libcap for the ptp helper permissions - Enable libcap for the ptp helper permissions
- Resolves: rhbz#1756299
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-2 * Fri Jun 29 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.14.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Use python3 for docs generation
* Tue Apr 23 2019 Wim Taymans <wtaymans@redhat.com> - 1.16.0-1
- Update to 1.16.0
* Fri Mar 01 2019 Wim Taymans <wtaymans@redhat.com> - 1.15.2-1
- Update to 1.15.2
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 28 2019 Wim Taymans <wtaymans@redhat.com> - 1.15.1-2
- Rebuild for dependencies
* Fri Jan 25 2019 Wim Taymans <wtaymans@redhat.com> - 1.15.1-1
- Update to 1.15.1
* Wed Oct 03 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.4-1
- Update to 1.14.4
* Tue Sep 18 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.3-1
- Update to 1.14.3
* Mon Jul 23 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.2-1
- Update to 1.14.2
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 15 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.1-5
- Remove xfig build dependency. It has not been needed since
version 1.2.0
* Wed Jun 06 2018 Bastien Nocera <bnocera@redhat.com> - 1.14.1-4
- Remove -Wcast-align fix patch, it's not complete
* Wed Jun 06 2018 Bastien Nocera <bnocera@redhat.com> - 1.14.1-3
- Add test patch to shut -Wcast-align warnings
* Fri May 25 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.1-2
- Update gstreamer1.prov file: Only scan in plugin directories
and relax file name and type. (#1581325)
* Mon May 21 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.1-1 * Fri Jun 15 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.0-2
- Update to 1.14.1 - Remove (obsolete since 1.2.0) xfig build dependency.
- Remove obsolete patch
* Tue Mar 20 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.0-1 * Tue Mar 20 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.0-1
- Update to 1.14.0 - Update to 1.14.0

Loading…
Cancel
Save