Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'update14' into 'master'
Update to 1.14.1

See merge request mer-core/gstreamer!7
  • Loading branch information
Andrew Branson committed Jun 8, 2018
2 parents 8406e0a + 125a343 commit 4d8fe30
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gstreamer
Submodule gstreamer updated from 3eff91 to cba2c7
2 changes: 1 addition & 1 deletion rpm/deactivate_max_size_time.patch
@@ -1,6 +1,6 @@
--- a/plugins/elements/gstqueue2.c 2018-03-23 14:33:51.033985808 +0100
+++ b/plugins/elements/gstqueue2.c 2018-03-23 14:34:37.526074183 +0100
@@ -111,7 +111,7 @@
@@ -108,7 +108,7 @@
/* default property values */
#define DEFAULT_MAX_SIZE_BUFFERS 100 /* 100 buffers */
#define DEFAULT_MAX_SIZE_BYTES (2 * 1024 * 1024) /* 2 MB */
Expand Down
3 changes: 2 additions & 1 deletion rpm/gstreamer.spec
Expand Up @@ -2,7 +2,7 @@
%define majorminor 1.0

Name: %{gstreamer}%{majorminor}
Version: 1.10.4
Version: 1.14.1
Release: 1
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
Expand Down Expand Up @@ -100,6 +100,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -fr $RPM_BUILD_ROOT%{_datadir}/gtk-doc
rm -fr $RPM_BUILD_ROOT/%{_mandir}
rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/
rm -f $RPM_BUILD_ROOT/%{_libexecdir}/gstreamer-%{majorminor}/gst-completion-helper

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
Expand Down

0 comments on commit 4d8fe30

Please sign in to comment.