Commit d9ba06b5 authored by Andrew Branson's avatar Andrew Branson Committed by Andrew Branson

[update] Update to 1.16.1. Switch to meson build. Fixes MER#2068

parent ccb6fb41
[submodule "gstreamer"] [submodule "gstreamer"]
path = gstreamer path = gstreamer
url = git://anongit.freedesktop.org/gstreamer/gstreamer url = https://git.sailfishos.org/mirror/gstreamer.git
Subproject commit cba2c7dd89dc4cefebe6592b9b98e6e097bd840e Subproject commit de0a7c4bc89a3df7424b808c893ca243629bebef
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%define majorminor 1.0 %define majorminor 1.0
Name: %{gstreamer}%{majorminor} Name: %{gstreamer}%{majorminor}
Version: 1.14.1 Version: 1.16.1
Release: 1 Release: 1
Summary: GStreamer streaming media framework runtime Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia Group: Applications/Multimedia
...@@ -15,9 +15,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) ...@@ -15,9 +15,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(check)
BuildRequires: pkgconfig(libdw)
BuildRequires: python BuildRequires: python
BuildRequires: autoconf BuildRequires: meson
BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
BuildRequires: gettext-devel BuildRequires: gettext-devel
Obsoletes: gst-av Obsoletes: gst-av
...@@ -69,26 +69,24 @@ This package contains some GStreamer useful tools ...@@ -69,26 +69,24 @@ This package contains some GStreamer useful tools
%patch1 -p1 %patch1 -p1
%build %build
NOCONFIGURE=1 ./autogen.sh %meson \
%configure \ -Dpackage-name='SailfishOS GStreamer package' \
--with-package-name='SailfishOS GStreamer package' \ -Dpackage-origin='http://sailfishos.org/' \
--with-package-origin='http://jolla.com' \ -Dgst_debug=true \
--enable-debug \ -Dintrospection=enabled \
--enable-introspection=yes \ -Dnls=disabled \
--disable-nls \ -Dexamples=disabled \
--disable-examples \ -Dgtk_doc=disabled \
--enable-docbook=no \ -Dbash-completion=disabled \
--enable-gtk-doc=no \ -Dtracer_hooks=true \
--enable-gtk-doc-html=no \ -Dlibunwind=disabled \
--enable-gtk-doc-pdf=no \ -Ddbghelp=disabled
--enable-trace \
--enable-alloc-trace %meson_build
make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT 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 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. # Clean out files that should not be part of the rpm.
...@@ -100,8 +98,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a ...@@ -100,8 +98,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -fr $RPM_BUILD_ROOT%{_datadir}/gtk-doc rm -fr $RPM_BUILD_ROOT%{_datadir}/gtk-doc
rm -fr $RPM_BUILD_ROOT/%{_mandir} rm -fr $RPM_BUILD_ROOT/%{_mandir}
rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/ rm -fr $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/gdb
rm -f $RPM_BUILD_ROOT/%{_libexecdir}/gstreamer-%{majorminor}/gst-completion-helper rm -fr $RPM_BUILD_ROOT/%{_datadir}/gstreamer-%{majorminor}/gdb
rm -fr $RPM_BUILD_ROOT/%{_datadir}/gdb
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment