Skip to content

Commit d9ba06b

Browse files
Andrew Bransonabranson
authored andcommitted
[update] Update to 1.16.1. Switch to meson build. Fixes MER#2068
1 parent ccb6fb4 commit d9ba06b

3 files changed

Lines changed: 23 additions & 24 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "gstreamer"]
22
path = gstreamer
3-
url = git://anongit.freedesktop.org/gstreamer/gstreamer
3+
url = https://git.sailfishos.org/mirror/gstreamer.git

gstreamer

Submodule gstreamer updated from cba2c7d to de0a7c4

rpm/gstreamer.spec

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%define majorminor 1.0
33

44
Name: %{gstreamer}%{majorminor}
5-
Version: 1.14.1
5+
Version: 1.16.1
66
Release: 1
77
Summary: GStreamer streaming media framework runtime
88
Group: Applications/Multimedia
@@ -15,9 +15,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
1515
BuildRequires: bison
1616
BuildRequires: flex
1717
BuildRequires: pkgconfig(check)
18+
BuildRequires: pkgconfig(libdw)
1819
BuildRequires: python
19-
BuildRequires: autoconf
20-
BuildRequires: automake
20+
BuildRequires: meson
2121
BuildRequires: libtool
2222
BuildRequires: gettext-devel
2323
Obsoletes: gst-av
@@ -69,26 +69,24 @@ This package contains some GStreamer useful tools
6969
%patch1 -p1
7070

7171
%build
72-
NOCONFIGURE=1 ./autogen.sh
73-
%configure \
74-
--with-package-name='SailfishOS GStreamer package' \
75-
--with-package-origin='http://jolla.com' \
76-
--enable-debug \
77-
--enable-introspection=yes \
78-
--disable-nls \
79-
--disable-examples \
80-
--enable-docbook=no \
81-
--enable-gtk-doc=no \
82-
--enable-gtk-doc-html=no \
83-
--enable-gtk-doc-pdf=no \
84-
--enable-trace \
85-
--enable-alloc-trace
86-
87-
make %{?_smp_mflags}
72+
%meson \
73+
-Dpackage-name='SailfishOS GStreamer package' \
74+
-Dpackage-origin='http://sailfishos.org/' \
75+
-Dgst_debug=true \
76+
-Dintrospection=enabled \
77+
-Dnls=disabled \
78+
-Dexamples=disabled \
79+
-Dgtk_doc=disabled \
80+
-Dbash-completion=disabled \
81+
-Dtracer_hooks=true \
82+
-Dlibunwind=disabled \
83+
-Ddbghelp=disabled
84+
85+
%meson_build
8886

8987
%install
9088
rm -rf $RPM_BUILD_ROOT
91-
%make_install
89+
%meson_install
9290
install -m 644 -D %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/pulse/xpolicy.conf.d/gstreamer1.0.conf
9391

9492
# Clean out files that should not be part of the rpm.
@@ -100,8 +98,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
10098
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
10199
rm -fr $RPM_BUILD_ROOT%{_datadir}/gtk-doc
102100
rm -fr $RPM_BUILD_ROOT/%{_mandir}
103-
rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/
104-
rm -f $RPM_BUILD_ROOT/%{_libexecdir}/gstreamer-%{majorminor}/gst-completion-helper
101+
rm -fr $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/gdb
102+
rm -fr $RPM_BUILD_ROOT/%{_datadir}/gstreamer-%{majorminor}/gdb
103+
rm -fr $RPM_BUILD_ROOT/%{_datadir}/gdb
105104

106105
%post -p /sbin/ldconfig
107106
%postun -p /sbin/ldconfig

0 commit comments

Comments
 (0)