Merge branch 'jb51545' into 'master'

[gstreamer] Update to 1.18.1. JB#51545 See merge request mer-core/gstreamer!13
sailfishos · Nov 3, 2020 · 25bfe90 · 25bfe90
2 parents 1aacbc1 + 764334d
commit 25bfe90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/gstreamer b/gstreamer
diff --git a/rpm/deactivate_max_size_time.patch b/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
-@@ -108,7 +108,7 @@
+@@ -114,7 +114,7 @@
  /* default property values */
  #define DEFAULT_MAX_SIZE_BUFFERS   100  /* 100 buffers */
  #define DEFAULT_MAX_SIZE_BYTES     (2 * 1024 * 1024)    /* 2 MB */

diff --git a/rpm/gstreamer.spec b/rpm/gstreamer.spec
@@ -2,7 +2,7 @@
 %define    majorminor  1.0
 
 Name:          %{gstreamer}%{majorminor}
-Version:       1.16.2
+Version:       1.18.1
 Release:       1
 Summary:       GStreamer streaming media framework runtime
 License:       LGPLv2+
@@ -63,8 +63,7 @@ plugins.
 This package contains some GStreamer useful tools
 
 %prep
-%setup -q -n %{name}-%{version}/gstreamer
-%patch1 -p1
+%autosetup -p1 -n %{name}-%{version}/gstreamer
 
 %build
 %meson \
@@ -75,6 +74,7 @@ This package contains some GStreamer useful tools
   -Dnls=disabled \
   -Dexamples=disabled \
   -Dgtk_doc=disabled \
+  -Ddoc=disabled \
   -Dbash-completion=disabled \
   -Dtracer_hooks=true \
   -Dlibunwind=disabled \
@@ -94,8 +94,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -fr $RPM_BUILD_ROOT%{_datadir}/gtk-doc
+# Remove docs
 rm -fr $RPM_BUILD_ROOT/%{_mandir}
+rm -f $RPM_BUILD_ROOT/%{_libexecdir}/gstreamer-%{majorminor}/gst-hotdoc-plugins-scanner
+rm -f $RPM_BUILD_ROOT/%{_libexecdir}/gstreamer-%{majorminor}/gst-plugins-doc-cache-generator
+# Remove GDB
 rm -fr $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/gdb
 rm -fr $RPM_BUILD_ROOT/%{_datadir}/gstreamer-%{majorminor}/gdb
 rm -fr $RPM_BUILD_ROOT/%{_datadir}/gdb
@@ -156,4 +159,5 @@ rm -fr $RPM_BUILD_ROOT/%{_datadir}/gdb
 %{_bindir}/gst-launch-%{majorminor}
 %{_bindir}/gst-typefind-%{majorminor}
 %{_bindir}/gst-stats-%{majorminor}
+%{_bindir}/gst-tester-%{majorminor}
 %{_sysconfdir}/pulse/xpolicy.conf.d/gstreamer1.0.conf