Compare commits

..

No commits in common. "master" and "f26" have entirely different histories.
master ... f26

6 changed files with 65 additions and 206 deletions

14
.gitignore vendored
View File

@ -54,17 +54,3 @@
/gstreamer-1.12.1.tar.xz
/gstreamer-1.12.2.tar.xz
/gstreamer-1.12.3.tar.xz
/gstreamer-1.12.4.tar.xz
/gstreamer-1.13.1.tar.xz
/gstreamer-1.13.90.tar.xz
/gstreamer-1.13.91.tar.xz
/gstreamer-1.14.0.tar.xz
/gstreamer-1.14.1.tar.xz
/gstreamer-1.14.2.tar.xz
/gstreamer-1.14.3.tar.xz
/gstreamer-1.14.4.tar.xz
/gstreamer-1.15.1.tar.xz
/gstreamer-1.15.2.tar.xz
/gstreamer-1.16.0.tar.xz
/gstreamer-1.16.1.tar.xz
/gstreamer-1.16.2.tar.xz

View File

@ -1,41 +0,0 @@
From b4ff2c8805221bcff6895c543cb019a817ad7104 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 22 Feb 2018 09:52:03 +0100
Subject: [PATCH] avoid compilation errors with newer glib
Newest glib does type propagation. Do an explicit cast to the
right type to silence the compiler.
---
gst/gstchildproxy.c | 2 +-
gst/parse/grammar.y | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gst/gstchildproxy.c b/gst/gstchildproxy.c
index ca5e47ea3..1bf983afa 100644
--- a/gst/gstchildproxy.c
+++ b/gst/gstchildproxy.c
@@ -209,7 +209,7 @@ gst_child_proxy_lookup (GstChildProxy * object, const gchar * name,
g_return_val_if_fail (GST_IS_CHILD_PROXY (object), FALSE);
g_return_val_if_fail (name != NULL, FALSE);
- obj = g_object_ref (object);
+ obj = G_OBJECT (g_object_ref (object));
current = names = g_strsplit (name, "::", -1);
/* find the owner of the property */
diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index bc4c3c1ed..0b3d04821 100644
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -406,7 +406,7 @@ static void gst_parse_element_set (gchar *value, GstElement *element, graph_t *g
} else {
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (element), value);
if (pspec != NULL) {
- target = g_object_ref (element);
+ target = G_OBJECT(g_object_ref (element));
GST_CAT_LOG_OBJECT (GST_CAT_PIPELINE, target, "found %s property", value);
} else {
SET_ERROR (graph->error, GST_PARSE_ERROR_NO_SUCH_PROPERTY, \
--
2.14.3

View File

@ -1,21 +1,21 @@
From 22e55e9f8eba1f483588d18b0b7d83fe7d40b590 Mon Sep 17 00:00:00 2001
From b00e7fff5190e424a03d3827312f63028b684faf Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 4 Jan 2016 11:39:33 +0100
Subject: [PATCH] inspect: Add RPM output format
---
tools/gst-inspect.c | 277 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 262 insertions(+), 15 deletions(-)
tools/gst-inspect.c | 276 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 261 insertions(+), 15 deletions(-)
diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 823e82b61..96f5bc786 100644
index e420e4c..1096e8c 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -1728,7 +1728,224 @@ print_tracer_info (GstPluginFeature * feature, gboolean print_names)
* is meant for machines, not humans.
*/
static void
-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
@@ -1335,9 +1335,225 @@ print_element_info (GstElementFactory * factory, gboolean print_names)
return 0;
}
+static void
+print_gst_structure_append_field (GList * strings, const char *field)
+{
+ GList *s;
@ -26,8 +26,9 @@ index 823e82b61..96f5bc786 100644
+ g_string_append (s->data, field);
+ }
+}
+
+static void
static void
-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+print_gst_structure_append_field_index (GList * strings, const char *field,
+ guint num_items, guint offset)
+{
@ -237,7 +238,7 @@ index 823e82b61..96f5bc786 100644
{
GstPadDirection direction;
const gchar *type_name;
@@ -1754,6 +1971,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
@@ -1363,6 +1579,13 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
return;
}
@ -251,7 +252,7 @@ index 823e82b61..96f5bc786 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);
@@ -1790,15 +2014,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
@@ -1399,15 +1622,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");
@ -276,7 +277,7 @@ index 823e82b61..96f5bc786 100644
{
const gchar *const *protocols;
@@ -1807,13 +2036,19 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
@@ -1416,13 +1644,19 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK:
while (*protocols != NULL) {
@ -298,7 +299,7 @@ index 823e82b61..96f5bc786 100644
++protocols;
}
break;
@@ -1824,7 +2059,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
@@ -1433,7 +1667,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
}
static void
@ -307,7 +308,7 @@ index 823e82b61..96f5bc786 100644
{
GList *features, *l;
@@ -1843,11 +2078,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
@@ -1452,11 +1686,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
if (feature_plugin == plugin) {
GstElementFactory *factory;
@ -326,7 +327,7 @@ index 823e82b61..96f5bc786 100644
}
if (feature_plugin)
gst_object_unref (feature_plugin);
@@ -1869,7 +2108,7 @@ print_all_plugin_automatic_install_info (void)
@@ -1478,7 +1716,7 @@ print_all_plugin_automatic_install_info (void)
plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins);
@ -335,7 +336,7 @@ index 823e82b61..96f5bc786 100644
}
gst_plugin_list_free (orig_plugins);
}
@@ -1934,6 +2173,7 @@ main (int argc, char *argv[])
@@ -1490,6 +1728,7 @@ main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
@ -343,7 +344,7 @@ index 823e82b61..96f5bc786 100644
gboolean uri_handlers = FALSE;
gboolean check_exists = FALSE;
gchar *min_version = NULL;
@@ -1954,6 +2194,9 @@ main (int argc, char *argv[])
@@ -1508,6 +1747,9 @@ main (int argc, char *argv[])
"or all plugins provide.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
@ -353,7 +354,7 @@ index 823e82b61..96f5bc786 100644
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL},
{"types", 't', 0, G_OPTION_ARG_STRING, &types,
@@ -2109,7 +2352,7 @@ main (int argc, char *argv[])
@@ -1650,7 +1892,7 @@ main (int argc, char *argv[])
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
@ -362,7 +363,7 @@ index 823e82b61..96f5bc786 100644
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
@@ -2122,13 +2365,17 @@ main (int argc, char *argv[])
@@ -1663,13 +1905,17 @@ main (int argc, char *argv[])
if (plugin) {
if (print_aii) {
@ -380,8 +381,8 @@ index 823e82b61..96f5bc786 100644
+ g_printerr (_("Could not load plugin file: %s\n"),
+ error->message);
g_clear_error (&error);
exit_code = -1;
goto done;
return -1;
}
--
2.20.1
2.9.3

View File

@ -9,7 +9,7 @@
# 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•
case `uname -m` in
@ -17,8 +17,8 @@ case `uname -m` in
*) mark64="()(64bit)" ;;
esac
solist=$(echo $filelist | \
xargs file -L 2>/dev/null | grep "ELF" | cut -d: -f1 )
solist=$(echo $filelist | grep "libgst" | \
xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1 )
function getmark()
{

View File

@ -7,11 +7,10 @@
%global _glib2 2.32.0
%global _libxml2 2.4.0
%global _gobject_introspection 1.31.1
%global __python %{__python3}
Name: gstreamer1
Version: 1.16.2
Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist}
Version: 1.12.3
Release: 1%{?gitcommit:.git%{shortcommit}}%{?dist}
Summary: GStreamer streaming media framework runtime
License: LGPLv2+
@ -38,24 +37,24 @@ BuildRequires: check-devel
BuildRequires: gtk-doc >= 1.3
BuildRequires: gettext
BuildRequires: pkgconfig
BuildRequires: libcap-devel
# ./autogen.sh deps
BuildRequires: automake gettext-devel libtool
BuildRequires: chrpath
### documentation requirements
BuildRequires: python3
BuildRequires: python2
BuildRequires: openjade
BuildRequires: texlive-jadetex
BuildRequires: jadetex
BuildRequires: libxslt
BuildRequires: docbook-style-dsssl
BuildRequires: docbook-style-xsl
BuildRequires: docbook-utils
BuildRequires: transfig
BuildRequires: netpbm-progs
BuildRequires: texlive-dvips
BuildRequires: tetex-dvips
BuildRequires: ghostscript
%if !0%{?rhel}
BuildRequires: xfig
%endif
%description
GStreamer is a streaming media framework, based on graphs of filters which
@ -68,12 +67,11 @@ plugins.
%package devel
Summary: Libraries/include files for GStreamer streaming media framework
Requires: %{name}%{?isa} = %{version}-%{release}
Requires: glib2-devel%{?_isa} >= %{_glib2}
Requires: libxml2-devel%{?_isa} >= %{_libxml2}
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel >= %{_glib2}
Requires: libxml2-devel >= %{_libxml2}
Requires: check-devel
# file /usr/include/gstreamer-1.0/gst/base/gstaggregator.h conflicts between attempted installs of gstreamer1-plugins-bad-free-devel-1.12.4-3.fc28.x86_64 and gstreamer1-devel-1.13.1-1.fc29.x86_64
Conflicts: gstreamer1-plugins-bad-free-devel < 1.13
%description devel
The %{name}-devel package contains libraries and header files for
@ -85,6 +83,7 @@ Summary: Developer documentation for GStreamer streaming media framework
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description devel-docs
This %{name}-devel-docs contains developer documentation for the
GStreamer streaming media framework.
@ -95,37 +94,46 @@ GStreamer streaming media framework.
%patch0 -p1 -b .rpm-provides
%build
NOCONFIGURE=1 \
./autogen.sh
%configure \
--with-package-name='Fedora GStreamer package' \
--with-package-origin='http://download.fedoraproject.org' \
--enable-gtk-doc \
--enable-debug \
--disable-fatal-warnings \
--disable-silent-rules \
--disable-tests --disable-examples \
--with-ptp-helper-permissions=capabilities
%make_build V=1
--disable-tests --disable-examples
make %{?_smp_mflags} V=1
%install
%make_install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove rpath.
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstbase-1.0.so.*
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstcheck-1.0.so.*
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstcontroller-1.0.so.*
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstnet-1.0.so.*
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so
chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gstreamer-%{majorminor}/gst-completion-helper
chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gstreamer-%{majorminor}/gst-ptp-helper
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-inspect-1.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-launch-1.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-stats-1.0
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-typefind-1.0
%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 {} ';'
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
# Add the provides script
install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/gstreamer1.prov
# Add the gstreamer plugin file attribute entry (rpm >= 4.9.0)
install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer1.attr
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files -f gstreamer-%{majorminor}.lang
%license COPYING
@ -192,10 +200,6 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4
%dir %{_datadir}/gstreamer-%{majorminor}/gdb/
%{_datadir}/gstreamer-%{majorminor}/gdb/
%{_datadir}/gdb/auto-load/
%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-base-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-controller-%{majorminor}.pc
@ -209,97 +213,6 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%changelog
* 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
- Enable libcap for the ptp helper permissions
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* 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
- Update to 1.14.1
- Remove obsolete patch
* Tue Mar 20 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.0-1
- Update to 1.14.0
* Wed Mar 14 2018 Wim Taymans <wtaymans@redhat.com> - 1.13.91-1
- Update to 1.13.91
- fix doc dependencies
* Mon Mar 05 2018 Wim Taymans <wtaymans@redhat.com> - 1.13.90-1
- Update to 1.13.90
* Fri Feb 23 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.13.1-3
- %%build: --disable-fatal-warnings --disable-silent-rules
- fix rpath harder
- use %%ldconfig_scriptlets, %%make_build, %%make_install
- -devel: tighten deps with %%{_isa}
* Fri Feb 23 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.13.1-2
- -devel: Conflicts: gstreamer1-plugins-bad-free-devel < 1.13
* Thu Feb 22 2018 Wim Taymans <wtaymans@redhat.com> - 1.13.1-1
- Update to 1.13.1
- Update rpm patch
- Fix compiler error
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Dec 11 2017 Wim Taymans <wtaymans@redhat.com> - 1.12.4-1
- Update to 1.12.4
* Fri Oct 13 2017 Troy Dawson <tdawson@redhat.com> - 1.12.3-2
- Cleanup spec file conditionals
* Tue Sep 19 2017 Wim Taymans <wtaymans@redhat.com> - 1.12.3-1
- Update to 1.12.3

View File

@ -1 +1 @@
SHA512 (gstreamer-1.16.2.tar.xz) = a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
SHA512 (gstreamer-1.12.3.tar.xz) = fceeeca4314aead7ff358db3474bd6fe1eef70f745a6ba20505da6c0caaea6ea6317246dc66c23edab396ca811a610c52fa930f8f99c701241ae7f15857aa2b0