Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update to 1.14.0, incl. switch to Meson build
  • Loading branch information
Andrew Branson committed May 4, 2018
1 parent 8406e0a commit 2a88e46
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 23 deletions.
2 changes: 1 addition & 1 deletion gstreamer
Submodule gstreamer updated from 3eff91 to 80e0e9
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
33 changes: 12 additions & 21 deletions rpm/gstreamer.spec
Expand Up @@ -2,7 +2,7 @@
%define majorminor 1.0

Name: %{gstreamer}%{majorminor}
Version: 1.10.4
Version: 1.14.0
Release: 1
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
Expand All @@ -16,8 +16,7 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: pkgconfig(check)
BuildRequires: python
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: meson
BuildRequires: libtool
BuildRequires: gettext-devel
Obsoletes: gst-av
Expand Down Expand Up @@ -69,26 +68,18 @@ 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 \
-Dwith-package-name='SailfishOS GStreamer package' \
-Dwith-package-origin='http://sailfishos.org/' \
-Ddisable_libunwind=true \
-Ddisable_examples=true \
-Ddisable_gtkdoc=true

%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.
Expand All @@ -97,9 +88,9 @@ 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
rm -fr $RPM_BUILD_ROOT/%{_mandir}
rm -fr $RPM_BUILD_ROOT/%{_datadir}/bash-completion/
rm -fr $RPM_BUILD_ROOT/%{_datadir}/locale

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

0 comments on commit 2a88e46

Please sign in to comment.