From d9ba06b5c5a2cd88350ce1ffd5ac7959cb007264 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@jollamobile.com>
Date: Fri, 3 May 2019 17:53:07 +0200
Subject: [PATCH] [update] Update to 1.16.1. Switch to meson build. Fixes
 MER#2068

---
 .gitmodules        |  2 +-
 gstreamer          |  2 +-
 rpm/gstreamer.spec | 43 +++++++++++++++++++++----------------------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9ac01f9..be111bf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gstreamer"]
 	path = gstreamer
-	url = git://anongit.freedesktop.org/gstreamer/gstreamer
+	url = https://git.sailfishos.org/mirror/gstreamer.git
diff --git a/gstreamer b/gstreamer
index cba2c7d..de0a7c4 160000
--- a/gstreamer
+++ b/gstreamer
@@ -1 +1 @@
-Subproject commit cba2c7dd89dc4cefebe6592b9b98e6e097bd840e
+Subproject commit de0a7c4bc89a3df7424b808c893ca243629bebef
diff --git a/rpm/gstreamer.spec b/rpm/gstreamer.spec
index 1b7e2ac..00fe362 100644
--- a/rpm/gstreamer.spec
+++ b/rpm/gstreamer.spec
@@ -2,7 +2,7 @@
 %define    majorminor  1.0
 
 Name:          %{gstreamer}%{majorminor}
-Version:       1.14.1
+Version:       1.16.1
 Release:       1
 Summary:       GStreamer streaming media framework runtime
 Group:         Applications/Multimedia
@@ -15,9 +15,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: pkgconfig(check)
+BuildRequires: pkgconfig(libdw)
 BuildRequires: python
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: meson
 BuildRequires: libtool
 BuildRequires: gettext-devel
 Obsoletes:     gst-av
@@ -69,26 +69,24 @@ This package contains some GStreamer useful tools
 %patch1 -p1
 
 %build
-NOCONFIGURE=1 ./autogen.sh
-%configure \
-  --with-package-name='SailfishOS GStreamer package' \
-  --with-package-origin='http://jolla.com' \
-  --enable-debug \
-  --enable-introspection=yes \
-  --disable-nls \
-  --disable-examples \
-  --enable-docbook=no \
-  --enable-gtk-doc=no \
-  --enable-gtk-doc-html=no \
-  --enable-gtk-doc-pdf=no \
-  --enable-trace \
-  --enable-alloc-trace
-
-make %{?_smp_mflags}
+%meson \
+  -Dpackage-name='SailfishOS GStreamer package' \
+  -Dpackage-origin='http://sailfishos.org/' \
+  -Dgst_debug=true \
+  -Dintrospection=enabled \
+  -Dnls=disabled \
+  -Dexamples=disabled \
+  -Dgtk_doc=disabled \
+  -Dbash-completion=disabled \
+  -Dtracer_hooks=true \
+  -Dlibunwind=disabled \
+  -Ddbghelp=disabled
+
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%make_install
+%meson_install
 install -m 644 -D %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/pulse/xpolicy.conf.d/gstreamer1.0.conf
 
 # Clean out files that should not be part of the rpm.
@@ -100,8 +98,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 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
+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
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig